CVS commit: src/external/gpl3/gdb

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Dec  6 05:23:07 UTC 2020

Modified Files:
src/external/gpl3/gdb/dist/gdb: mips-nbsd-nat.c
src/external/gpl3/gdb/lib/libbfd/arch/mips64el: bfd_stdint.h
src/external/gpl3/gdb/lib/libbfd/arch/mipseb: bfd-in3.h bfd.h
bfd_stdint.h bfdver.h config.h defs.mk targmatch.h
src/external/gpl3/gdb/lib/libdecnumber/arch/mips64el: gstdint.h
src/external/gpl3/gdb/lib/libdecnumber/arch/mipseb: config.h gstdint.h
src/external/gpl3/gdb/lib/libgdb/arch/mips64el: config.h defs.mk init.c
src/external/gpl3/gdb/lib/libgdb/arch/mipseb: config.h defs.mk init.c
jit-reader.h version.c xml-builtin.c
src/external/gpl3/gdb/lib/libgdb/arch/powerpc: config.h defs.mk init.c
jit-reader.h version.c xml-builtin.c
src/external/gpl3/gdb/lib/libgdbsupport/arch/mips64el/gdbsupport:
config.h
src/external/gpl3/gdb/lib/libgdbsupport/arch/powerpc: defs.mk
src/external/gpl3/gdb/lib/libgnulib/arch/mips64el: defs.mk
src/external/gpl3/gdb/lib/libgnulib/arch/mips64el/gnulib: config.h
src/external/gpl3/gdb/lib/libgnulib/arch/mips64el/gnulib/import:
unistd.h
src/external/gpl3/gdb/lib/libiberty/arch/mipseb: defs.mk
src/external/gpl3/gdb/lib/libopcodes/arch/mipseb: config.h
src/external/gpl3/gdb/lib/libreadline/arch/mipseb: config.h defs.mk
Added Files:
src/external/gpl3/gdb/lib/libctf/arch/aarch64: config.h defs.mk
src/external/gpl3/gdb/lib/libctf/arch/mipseb: config.h defs.mk
src/external/gpl3/gdb/lib/libgdbsupport/arch/aarch64: defs.mk
src/external/gpl3/gdb/lib/libgdbsupport/arch/aarch64/gdbsupport:
config.h
src/external/gpl3/gdb/lib/libgdbsupport/arch/mipseb: defs.mk
src/external/gpl3/gdb/lib/libgdbsupport/arch/mipseb/gdbsupport:
config.h
src/external/gpl3/gdb/lib/libgnulib/arch/aarch64: defs.mk
src/external/gpl3/gdb/lib/libgnulib/arch/aarch64/gnulib: config.h
src/external/gpl3/gdb/lib/libgnulib/arch/aarch64/gnulib/import:
alloca.h ctype.h dirent.h fcntl.h fnmatch.h glob.h inttypes.h
limits.h locale.h math.h signal.h stdint.h stdio.h stdlib.h
string.h time.h unistd.h wchar.h wctype.h
src/external/gpl3/gdb/lib/libgnulib/arch/mipseb: defs.mk
src/external/gpl3/gdb/lib/libgnulib/arch/mipseb/gnulib: config.h
src/external/gpl3/gdb/lib/libgnulib/arch/mipseb/gnulib/import: alloca.h
ctype.h dirent.h fcntl.h fnmatch.h glob.h inttypes.h limits.h
locale.h math.h signal.h stdint.h stdio.h stdlib.h string.h time.h
unistd.h wchar.h wctype.h

Log Message:
regen more mips and aarch64


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gdb/dist/gdb/mips-nbsd-nat.c
cvs rdiff -u -r1.7 -r1.8 \
src/external/gpl3/gdb/lib/libbfd/arch/mips64el/bfd_stdint.h
cvs rdiff -u -r1.8 -r1.9 \
src/external/gpl3/gdb/lib/libbfd/arch/mipseb/bfd-in3.h \
src/external/gpl3/gdb/lib/libbfd/arch/mipseb/bfd.h \
src/external/gpl3/gdb/lib/libbfd/arch/mipseb/bfdver.h \
src/external/gpl3/gdb/lib/libbfd/arch/mipseb/defs.mk
cvs rdiff -u -r1.6 -r1.7 \
src/external/gpl3/gdb/lib/libbfd/arch/mipseb/bfd_stdint.h
cvs rdiff -u -r1.9 -r1.10 \
src/external/gpl3/gdb/lib/libbfd/arch/mipseb/config.h
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gdb/lib/libbfd/arch/mipseb/targmatch.h
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb/lib/libctf/arch/aarch64/config.h \
src/external/gpl3/gdb/lib/libctf/arch/aarch64/defs.mk
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb/lib/libctf/arch/mipseb/config.h \
src/external/gpl3/gdb/lib/libctf/arch/mipseb/defs.mk
cvs rdiff -u -r1.7 -r1.8 \
src/external/gpl3/gdb/lib/libdecnumber/arch/mips64el/gstdint.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/gdb/lib/libdecnumber/arch/mipseb/config.h
cvs rdiff -u -r1.6 -r1.7 \
src/external/gpl3/gdb/lib/libdecnumber/arch/mipseb/gstdint.h
cvs rdiff -u -r1.17 -r1.18 \
src/external/gpl3/gdb/lib/libgdb/arch/mips64el/config.h
cvs rdiff -u -r1.15 -r1.16 \
src/external/gpl3/gdb/lib/libgdb/arch/mips64el/defs.mk \
src/external/gpl3/gdb/lib/libgdb/arch/mips64el/init.c
cvs rdiff -u -r1.14 -r1.15 \
src/external/gpl3/gdb/lib/libgdb/arch/mipseb/config.h \
src/external/gpl3/gdb/lib/libgdb/arch/mipseb/defs.mk
cvs rdiff -u -r1.13 -r1.14 \
src/external/gpl3/gdb/lib/libgdb/arch/mipseb/init.c
cvs rdiff -u -r1.6 -r1.7 \
src/external/gpl3/gdb/lib/libgdb/arch/mipseb/jit-reader.h
cvs rdiff -u -r1.8 -r1.9 \
src/external/gpl3/gdb/lib/libgdb/arch/mipseb/version.c \
src/external/gpl3/gdb/lib/libgdb/arch/mipseb/xml-builtin.c
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gdb/lib/libgdb/arch/powerpc/config.h \
src/external/gpl3/gdb/lib/libgdb/arch/powerpc/defs.mk
cvs rdiff -u -r1.14 -r1.15 \

CVS commit: src/external/gpl3/gdb

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Dec  6 05:23:07 UTC 2020

Modified Files:
src/external/gpl3/gdb/dist/gdb: mips-nbsd-nat.c
src/external/gpl3/gdb/lib/libbfd/arch/mips64el: bfd_stdint.h
src/external/gpl3/gdb/lib/libbfd/arch/mipseb: bfd-in3.h bfd.h
bfd_stdint.h bfdver.h config.h defs.mk targmatch.h
src/external/gpl3/gdb/lib/libdecnumber/arch/mips64el: gstdint.h
src/external/gpl3/gdb/lib/libdecnumber/arch/mipseb: config.h gstdint.h
src/external/gpl3/gdb/lib/libgdb/arch/mips64el: config.h defs.mk init.c
src/external/gpl3/gdb/lib/libgdb/arch/mipseb: config.h defs.mk init.c
jit-reader.h version.c xml-builtin.c
src/external/gpl3/gdb/lib/libgdb/arch/powerpc: config.h defs.mk init.c
jit-reader.h version.c xml-builtin.c
src/external/gpl3/gdb/lib/libgdbsupport/arch/mips64el/gdbsupport:
config.h
src/external/gpl3/gdb/lib/libgdbsupport/arch/powerpc: defs.mk
src/external/gpl3/gdb/lib/libgnulib/arch/mips64el: defs.mk
src/external/gpl3/gdb/lib/libgnulib/arch/mips64el/gnulib: config.h
src/external/gpl3/gdb/lib/libgnulib/arch/mips64el/gnulib/import:
unistd.h
src/external/gpl3/gdb/lib/libiberty/arch/mipseb: defs.mk
src/external/gpl3/gdb/lib/libopcodes/arch/mipseb: config.h
src/external/gpl3/gdb/lib/libreadline/arch/mipseb: config.h defs.mk
Added Files:
src/external/gpl3/gdb/lib/libctf/arch/aarch64: config.h defs.mk
src/external/gpl3/gdb/lib/libctf/arch/mipseb: config.h defs.mk
src/external/gpl3/gdb/lib/libgdbsupport/arch/aarch64: defs.mk
src/external/gpl3/gdb/lib/libgdbsupport/arch/aarch64/gdbsupport:
config.h
src/external/gpl3/gdb/lib/libgdbsupport/arch/mipseb: defs.mk
src/external/gpl3/gdb/lib/libgdbsupport/arch/mipseb/gdbsupport:
config.h
src/external/gpl3/gdb/lib/libgnulib/arch/aarch64: defs.mk
src/external/gpl3/gdb/lib/libgnulib/arch/aarch64/gnulib: config.h
src/external/gpl3/gdb/lib/libgnulib/arch/aarch64/gnulib/import:
alloca.h ctype.h dirent.h fcntl.h fnmatch.h glob.h inttypes.h
limits.h locale.h math.h signal.h stdint.h stdio.h stdlib.h
string.h time.h unistd.h wchar.h wctype.h
src/external/gpl3/gdb/lib/libgnulib/arch/mipseb: defs.mk
src/external/gpl3/gdb/lib/libgnulib/arch/mipseb/gnulib: config.h
src/external/gpl3/gdb/lib/libgnulib/arch/mipseb/gnulib/import: alloca.h
ctype.h dirent.h fcntl.h fnmatch.h glob.h inttypes.h limits.h
locale.h math.h signal.h stdint.h stdio.h stdlib.h string.h time.h
unistd.h wchar.h wctype.h

Log Message:
regen more mips and aarch64


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gdb/dist/gdb/mips-nbsd-nat.c
cvs rdiff -u -r1.7 -r1.8 \
src/external/gpl3/gdb/lib/libbfd/arch/mips64el/bfd_stdint.h
cvs rdiff -u -r1.8 -r1.9 \
src/external/gpl3/gdb/lib/libbfd/arch/mipseb/bfd-in3.h \
src/external/gpl3/gdb/lib/libbfd/arch/mipseb/bfd.h \
src/external/gpl3/gdb/lib/libbfd/arch/mipseb/bfdver.h \
src/external/gpl3/gdb/lib/libbfd/arch/mipseb/defs.mk
cvs rdiff -u -r1.6 -r1.7 \
src/external/gpl3/gdb/lib/libbfd/arch/mipseb/bfd_stdint.h
cvs rdiff -u -r1.9 -r1.10 \
src/external/gpl3/gdb/lib/libbfd/arch/mipseb/config.h
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gdb/lib/libbfd/arch/mipseb/targmatch.h
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb/lib/libctf/arch/aarch64/config.h \
src/external/gpl3/gdb/lib/libctf/arch/aarch64/defs.mk
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb/lib/libctf/arch/mipseb/config.h \
src/external/gpl3/gdb/lib/libctf/arch/mipseb/defs.mk
cvs rdiff -u -r1.7 -r1.8 \
src/external/gpl3/gdb/lib/libdecnumber/arch/mips64el/gstdint.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/gdb/lib/libdecnumber/arch/mipseb/config.h
cvs rdiff -u -r1.6 -r1.7 \
src/external/gpl3/gdb/lib/libdecnumber/arch/mipseb/gstdint.h
cvs rdiff -u -r1.17 -r1.18 \
src/external/gpl3/gdb/lib/libgdb/arch/mips64el/config.h
cvs rdiff -u -r1.15 -r1.16 \
src/external/gpl3/gdb/lib/libgdb/arch/mips64el/defs.mk \
src/external/gpl3/gdb/lib/libgdb/arch/mips64el/init.c
cvs rdiff -u -r1.14 -r1.15 \
src/external/gpl3/gdb/lib/libgdb/arch/mipseb/config.h \
src/external/gpl3/gdb/lib/libgdb/arch/mipseb/defs.mk
cvs rdiff -u -r1.13 -r1.14 \
src/external/gpl3/gdb/lib/libgdb/arch/mipseb/init.c
cvs rdiff -u -r1.6 -r1.7 \
src/external/gpl3/gdb/lib/libgdb/arch/mipseb/jit-reader.h
cvs rdiff -u -r1.8 -r1.9 \
src/external/gpl3/gdb/lib/libgdb/arch/mipseb/version.c \
src/external/gpl3/gdb/lib/libgdb/arch/mipseb/xml-builtin.c
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gdb/lib/libgdb/arch/powerpc/config.h \
src/external/gpl3/gdb/lib/libgdb/arch/powerpc/defs.mk
cvs rdiff -u -r1.14 -r1.15 \

CVS commit: src/external/gpl3/gdb

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Dec  6 04:08:55 UTC 2020

Modified Files:
src/external/gpl3/gdb/dist/gdb: sh-nbsd-nat.c sh-nbsd-tdep.c
src/external/gpl3/gdb/lib/libbfd/arch/m68000: targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/m68k: targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/mips64eb: bfd_stdint.h
targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/mips64el: targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/mipsel: targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/sh3eb: targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/sparc: targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/sparc64: bfd_stdint.h targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/vax: targmatch.h
src/external/gpl3/gdb/lib/libdecnumber/arch/mips64eb: gstdint.h
src/external/gpl3/gdb/lib/libdecnumber/arch/sparc64: gstdint.h
src/external/gpl3/gdb/lib/libgdb: Makefile
src/external/gpl3/gdb/lib/libgdb/arch/m68000: config.h
src/external/gpl3/gdb/lib/libgdb/arch/m68k: config.h
src/external/gpl3/gdb/lib/libgdb/arch/mips64eb: config.h
src/external/gpl3/gdb/lib/libgdb/arch/mipsel: config.h
src/external/gpl3/gdb/lib/libgdb/arch/sparc: config.h
src/external/gpl3/gdb/lib/libgdb/arch/sparc64: config.h defs.mk init.c
src/external/gpl3/gdb/lib/libgdbsupport/arch/sparc64/gdbsupport:
config.h
src/external/gpl3/gdb/lib/libgnulib/arch/m68000/gnulib: config.h
src/external/gpl3/gdb/lib/libgnulib/arch/m68000/gnulib/import: unistd.h
src/external/gpl3/gdb/lib/libgnulib/arch/m68k/gnulib: config.h
src/external/gpl3/gdb/lib/libgnulib/arch/m68k/gnulib/import: unistd.h
src/external/gpl3/gdb/lib/libgnulib/arch/mips64eb/gnulib: config.h
src/external/gpl3/gdb/lib/libgnulib/arch/mips64eb/gnulib/import:
unistd.h
src/external/gpl3/gdb/lib/libgnulib/arch/mipsel/gnulib: config.h
src/external/gpl3/gdb/lib/libgnulib/arch/mipsel/gnulib/import: unistd.h
src/external/gpl3/gdb/lib/libgnulib/arch/sparc/gnulib: config.h
src/external/gpl3/gdb/lib/libgnulib/arch/sparc/gnulib/import: unistd.h
src/external/gpl3/gdb/lib/libgnulib/arch/sparc64: defs.mk
src/external/gpl3/gdb/lib/libgnulib/arch/sparc64/gnulib: config.h
src/external/gpl3/gdb/lib/libgnulib/arch/sparc64/gnulib/import:
unistd.h

Log Message:
fix sh3, regen some more


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gdb/dist/gdb/sh-nbsd-nat.c \
src/external/gpl3/gdb/dist/gdb/sh-nbsd-tdep.c
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gdb/lib/libbfd/arch/m68000/targmatch.h
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gdb/lib/libbfd/arch/m68k/targmatch.h
cvs rdiff -u -r1.8 -r1.9 \
src/external/gpl3/gdb/lib/libbfd/arch/mips64eb/bfd_stdint.h
cvs rdiff -u -r1.14 -r1.15 \
src/external/gpl3/gdb/lib/libbfd/arch/mips64eb/targmatch.h
cvs rdiff -u -r1.13 -r1.14 \
src/external/gpl3/gdb/lib/libbfd/arch/mips64el/targmatch.h
cvs rdiff -u -r1.13 -r1.14 \
src/external/gpl3/gdb/lib/libbfd/arch/mipsel/targmatch.h
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gdb/lib/libbfd/arch/sh3eb/targmatch.h
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gdb/lib/libbfd/arch/sparc/targmatch.h
cvs rdiff -u -r1.8 -r1.9 \
src/external/gpl3/gdb/lib/libbfd/arch/sparc64/bfd_stdint.h
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gdb/lib/libbfd/arch/sparc64/targmatch.h
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gdb/lib/libbfd/arch/vax/targmatch.h
cvs rdiff -u -r1.8 -r1.9 \
src/external/gpl3/gdb/lib/libdecnumber/arch/mips64eb/gstdint.h
cvs rdiff -u -r1.8 -r1.9 \
src/external/gpl3/gdb/lib/libdecnumber/arch/sparc64/gstdint.h
cvs rdiff -u -r1.28 -r1.29 src/external/gpl3/gdb/lib/libgdb/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gdb/lib/libgdb/arch/m68000/config.h
cvs rdiff -u -r1.13 -r1.14 \
src/external/gpl3/gdb/lib/libgdb/arch/m68k/config.h
cvs rdiff -u -r1.18 -r1.19 \
src/external/gpl3/gdb/lib/libgdb/arch/mips64eb/config.h
cvs rdiff -u -r1.15 -r1.16 \
src/external/gpl3/gdb/lib/libgdb/arch/mipsel/config.h
cvs rdiff -u -r1.13 -r1.14 \
src/external/gpl3/gdb/lib/libgdb/arch/sparc/config.h
cvs rdiff -u -r1.13 -r1.14 \
src/external/gpl3/gdb/lib/libgdb/arch/sparc64/config.h
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gdb/lib/libgdb/arch/sparc64/defs.mk
cvs rdiff -u -r1.14 -r1.15 \
src/external/gpl3/gdb/lib/libgdb/arch/sparc64/init.c
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gdb/lib/libgdbsupport/arch/sparc64/gdbsupport/config.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gdb/lib/libgnulib/arch/m68000/gnulib/config.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gdb/lib/libgnulib/arch/m68000/gnulib/import/unistd.h
cvs rdiff -u -r1.1 -r1.2 \

CVS commit: src/external/gpl3/gdb

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Dec  6 04:08:55 UTC 2020

Modified Files:
src/external/gpl3/gdb/dist/gdb: sh-nbsd-nat.c sh-nbsd-tdep.c
src/external/gpl3/gdb/lib/libbfd/arch/m68000: targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/m68k: targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/mips64eb: bfd_stdint.h
targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/mips64el: targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/mipsel: targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/sh3eb: targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/sparc: targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/sparc64: bfd_stdint.h targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/vax: targmatch.h
src/external/gpl3/gdb/lib/libdecnumber/arch/mips64eb: gstdint.h
src/external/gpl3/gdb/lib/libdecnumber/arch/sparc64: gstdint.h
src/external/gpl3/gdb/lib/libgdb: Makefile
src/external/gpl3/gdb/lib/libgdb/arch/m68000: config.h
src/external/gpl3/gdb/lib/libgdb/arch/m68k: config.h
src/external/gpl3/gdb/lib/libgdb/arch/mips64eb: config.h
src/external/gpl3/gdb/lib/libgdb/arch/mipsel: config.h
src/external/gpl3/gdb/lib/libgdb/arch/sparc: config.h
src/external/gpl3/gdb/lib/libgdb/arch/sparc64: config.h defs.mk init.c
src/external/gpl3/gdb/lib/libgdbsupport/arch/sparc64/gdbsupport:
config.h
src/external/gpl3/gdb/lib/libgnulib/arch/m68000/gnulib: config.h
src/external/gpl3/gdb/lib/libgnulib/arch/m68000/gnulib/import: unistd.h
src/external/gpl3/gdb/lib/libgnulib/arch/m68k/gnulib: config.h
src/external/gpl3/gdb/lib/libgnulib/arch/m68k/gnulib/import: unistd.h
src/external/gpl3/gdb/lib/libgnulib/arch/mips64eb/gnulib: config.h
src/external/gpl3/gdb/lib/libgnulib/arch/mips64eb/gnulib/import:
unistd.h
src/external/gpl3/gdb/lib/libgnulib/arch/mipsel/gnulib: config.h
src/external/gpl3/gdb/lib/libgnulib/arch/mipsel/gnulib/import: unistd.h
src/external/gpl3/gdb/lib/libgnulib/arch/sparc/gnulib: config.h
src/external/gpl3/gdb/lib/libgnulib/arch/sparc/gnulib/import: unistd.h
src/external/gpl3/gdb/lib/libgnulib/arch/sparc64: defs.mk
src/external/gpl3/gdb/lib/libgnulib/arch/sparc64/gnulib: config.h
src/external/gpl3/gdb/lib/libgnulib/arch/sparc64/gnulib/import:
unistd.h

Log Message:
fix sh3, regen some more


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gdb/dist/gdb/sh-nbsd-nat.c \
src/external/gpl3/gdb/dist/gdb/sh-nbsd-tdep.c
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gdb/lib/libbfd/arch/m68000/targmatch.h
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gdb/lib/libbfd/arch/m68k/targmatch.h
cvs rdiff -u -r1.8 -r1.9 \
src/external/gpl3/gdb/lib/libbfd/arch/mips64eb/bfd_stdint.h
cvs rdiff -u -r1.14 -r1.15 \
src/external/gpl3/gdb/lib/libbfd/arch/mips64eb/targmatch.h
cvs rdiff -u -r1.13 -r1.14 \
src/external/gpl3/gdb/lib/libbfd/arch/mips64el/targmatch.h
cvs rdiff -u -r1.13 -r1.14 \
src/external/gpl3/gdb/lib/libbfd/arch/mipsel/targmatch.h
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gdb/lib/libbfd/arch/sh3eb/targmatch.h
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gdb/lib/libbfd/arch/sparc/targmatch.h
cvs rdiff -u -r1.8 -r1.9 \
src/external/gpl3/gdb/lib/libbfd/arch/sparc64/bfd_stdint.h
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gdb/lib/libbfd/arch/sparc64/targmatch.h
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gdb/lib/libbfd/arch/vax/targmatch.h
cvs rdiff -u -r1.8 -r1.9 \
src/external/gpl3/gdb/lib/libdecnumber/arch/mips64eb/gstdint.h
cvs rdiff -u -r1.8 -r1.9 \
src/external/gpl3/gdb/lib/libdecnumber/arch/sparc64/gstdint.h
cvs rdiff -u -r1.28 -r1.29 src/external/gpl3/gdb/lib/libgdb/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gdb/lib/libgdb/arch/m68000/config.h
cvs rdiff -u -r1.13 -r1.14 \
src/external/gpl3/gdb/lib/libgdb/arch/m68k/config.h
cvs rdiff -u -r1.18 -r1.19 \
src/external/gpl3/gdb/lib/libgdb/arch/mips64eb/config.h
cvs rdiff -u -r1.15 -r1.16 \
src/external/gpl3/gdb/lib/libgdb/arch/mipsel/config.h
cvs rdiff -u -r1.13 -r1.14 \
src/external/gpl3/gdb/lib/libgdb/arch/sparc/config.h
cvs rdiff -u -r1.13 -r1.14 \
src/external/gpl3/gdb/lib/libgdb/arch/sparc64/config.h
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gdb/lib/libgdb/arch/sparc64/defs.mk
cvs rdiff -u -r1.14 -r1.15 \
src/external/gpl3/gdb/lib/libgdb/arch/sparc64/init.c
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gdb/lib/libgdbsupport/arch/sparc64/gdbsupport/config.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gdb/lib/libgnulib/arch/m68000/gnulib/config.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gdb/lib/libgnulib/arch/m68000/gnulib/import/unistd.h
cvs rdiff -u -r1.1 -r1.2 \

CVS commit: src/sys/arch/mips/include

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Dec  6 03:46:23 UTC 2020

Modified Files:
src/sys/arch/mips/include: proc.h types.h

Log Message:
don't expose vaddr_t to userland.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/mips/include/proc.h
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/mips/include/types.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/mips/include/proc.h
diff -u src/sys/arch/mips/include/proc.h:1.32 src/sys/arch/mips/include/proc.h:1.33
--- src/sys/arch/mips/include/proc.h:1.32	Fri Sep  4 04:17:53 2020
+++ src/sys/arch/mips/include/proc.h	Sat Dec  5 22:46:23 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: proc.h,v 1.32 2020/09/04 08:17:53 mrg Exp $	*/
+/*	$NetBSD: proc.h,v 1.33 2020/12/06 03:46:23 christos Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -49,7 +49,7 @@ struct trapframe;
 
 struct mdlwp {
 	struct trapframe *md_utf;	/* trapframe from userspace */
-	vaddr_t	md_ss_addr;		/* single step address for ptrace */
+	__vaddr_t md_ss_addr;		/* single step address for ptrace */
 	int	md_ss_instr;		/* single step instruction for ptrace */
 	volatile int md_astpending;	/* AST pending on return to userland */
 	int	md_upte[UPAGES_MAX];	/* ptes for mapping u page */
@@ -57,7 +57,7 @@ struct mdlwp {
 
 struct mdproc {
 	/* syscall entry for this process */
-	void	(*md_syscall)(struct lwp *, u_int, u_int, vaddr_t);
+	void	(*md_syscall)(struct lwp *, u_int, u_int, __vaddr_t);
 	int	md_abi;			/* which ABI is this process using? */
 };
 

Index: src/sys/arch/mips/include/types.h
diff -u src/sys/arch/mips/include/types.h:1.72 src/sys/arch/mips/include/types.h:1.73
--- src/sys/arch/mips/include/types.h:1.72	Sun Aug 16 23:19:35 2020
+++ src/sys/arch/mips/include/types.h	Sat Dec  5 22:46:23 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: types.h,v 1.72 2020/08/17 03:19:35 mrg Exp $	*/
+/*	$NetBSD: types.h,v 1.73 2020/12/06 03:46:23 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -64,6 +64,11 @@ typedef	__fpregister64_t	__fpregister_t;
  * the rest of the operating system as possible.
  */
 
+#ifdef _LP64
+typedef __uint64_t	__vaddr_t;
+#else
+typedef __uint32_t	__vaddr_t;
+#endif
 
 #if defined(_KERNEL) || defined(_KMEMUSER) || defined(_KERNTYPES) || defined(_STANDALONE)
 #if defined(_MIPS_PADDR_T_64BIT) || defined(_LP64)

CVS commit: src/sys/arch/mips/include

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Dec  6 03:46:23 UTC 2020

Modified Files:
src/sys/arch/mips/include: proc.h types.h

Log Message:
don't expose vaddr_t to userland.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/mips/include/proc.h
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/mips/include/types.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/gpl3/gdb/dist/gdb

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Dec  6 03:29:03 UTC 2020

Modified Files:
src/external/gpl3/gdb/dist/gdb: m68k-bsd-nat.c ppc-nbsd-nat.c
sparc-tdep.h vax-bsd-nat.c

Log Message:
fix m68k, ppc, sparc, vax


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gdb/dist/gdb/m68k-bsd-nat.c \
src/external/gpl3/gdb/dist/gdb/vax-bsd-nat.c
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gdb/dist/gdb/ppc-nbsd-nat.c
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/dist/gdb/sparc-tdep.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gdb/dist/gdb/m68k-bsd-nat.c
diff -u src/external/gpl3/gdb/dist/gdb/m68k-bsd-nat.c:1.8 src/external/gpl3/gdb/dist/gdb/m68k-bsd-nat.c:1.9
--- src/external/gpl3/gdb/dist/gdb/m68k-bsd-nat.c:1.8	Mon Sep 14 22:05:18 2020
+++ src/external/gpl3/gdb/dist/gdb/m68k-bsd-nat.c	Sat Dec  5 22:29:03 2020
@@ -18,7 +18,6 @@
along with this program.  If not, see .  */
 
 /* We define this to get types like register_t.  */
-#define _KERNTYPES
 #include "defs.h"
 #include "gdbcore.h"
 #include "inferior.h"
Index: src/external/gpl3/gdb/dist/gdb/vax-bsd-nat.c
diff -u src/external/gpl3/gdb/dist/gdb/vax-bsd-nat.c:1.8 src/external/gpl3/gdb/dist/gdb/vax-bsd-nat.c:1.9
--- src/external/gpl3/gdb/dist/gdb/vax-bsd-nat.c:1.8	Mon Sep 14 22:05:19 2020
+++ src/external/gpl3/gdb/dist/gdb/vax-bsd-nat.c	Sat Dec  5 22:29:03 2020
@@ -18,7 +18,6 @@
along with this program.  If not, see .  */
 
 /* We define this to get types like register_t.  */
-#define _KERNTYPES
 #include "defs.h"
 #include "inferior.h"
 #include "regcache.h"
@@ -59,7 +58,7 @@ static void
 vaxbsd_collect_gregset (const struct regcache *regcache,
 			void *gregs, int regnum)
 {
-  gdb_byte *regs = (void *)gregs;
+  gdb_byte *regs = (gdb_byte *)gregs;
   int i;
 
   for (i = 0; i <= VAX_NUM_REGS; i++)

Index: src/external/gpl3/gdb/dist/gdb/ppc-nbsd-nat.c
diff -u src/external/gpl3/gdb/dist/gdb/ppc-nbsd-nat.c:1.10 src/external/gpl3/gdb/dist/gdb/ppc-nbsd-nat.c:1.11
--- src/external/gpl3/gdb/dist/gdb/ppc-nbsd-nat.c:1.10	Mon Sep 14 22:05:18 2020
+++ src/external/gpl3/gdb/dist/gdb/ppc-nbsd-nat.c	Sat Dec  5 22:29:03 2020
@@ -20,7 +20,6 @@
along with this program.  If not, see .  */
 
 /* We define this to get types like register_t.  */
-#define _KERNTYPES
 #include "defs.h"
 
 #include 
@@ -33,8 +32,6 @@
 #include "inferior.h"
 #include "regcache.h"
 
-#include "common/gdb_assert.h"
-
 #include "nbsd-nat.h"
 #include "ppc-tdep.h"
 #include "ppc-nbsd-tdep.h"

Index: src/external/gpl3/gdb/dist/gdb/sparc-tdep.h
diff -u src/external/gpl3/gdb/dist/gdb/sparc-tdep.h:1.4 src/external/gpl3/gdb/dist/gdb/sparc-tdep.h:1.5
--- src/external/gpl3/gdb/dist/gdb/sparc-tdep.h:1.4	Mon Sep 14 22:05:19 2020
+++ src/external/gpl3/gdb/dist/gdb/sparc-tdep.h	Sat Dec  5 22:29:03 2020
@@ -255,9 +255,6 @@ extern const struct sparc_gregmap sparc3
 extern CORE_ADDR sparcnbsd_step_trap (struct frame_info *frame,
   unsigned long insn);
 
-extern void sparc32nbsd_init_abi (struct gdbarch_info info,
-  struct gdbarch *gdbarch);
-
 extern struct trad_frame_saved_reg *
   sparc32nbsd_sigcontext_saved_regs (struct frame_info *next_frame);
 

CVS commit: src/external/gpl3/gdb/dist/gdb

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Dec  6 03:29:03 UTC 2020

Modified Files:
src/external/gpl3/gdb/dist/gdb: m68k-bsd-nat.c ppc-nbsd-nat.c
sparc-tdep.h vax-bsd-nat.c

Log Message:
fix m68k, ppc, sparc, vax


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gdb/dist/gdb/m68k-bsd-nat.c \
src/external/gpl3/gdb/dist/gdb/vax-bsd-nat.c
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gdb/dist/gdb/ppc-nbsd-nat.c
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/dist/gdb/sparc-tdep.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/gpl3/gdb/bin

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Dec  6 03:28:26 UTC 2020

Modified Files:
src/external/gpl3/gdb/bin/gdb: Makefile
src/external/gpl3/gdb/bin/gdbtui: Makefile

Log Message:
need -lpthread for sun2


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/gpl3/gdb/bin/gdb/Makefile
cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gdb/bin/gdbtui/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/gpl3/gdb/bin/gdb/Makefile
diff -u src/external/gpl3/gdb/bin/gdb/Makefile:1.19 src/external/gpl3/gdb/bin/gdb/Makefile:1.20
--- src/external/gpl3/gdb/bin/gdb/Makefile:1.19	Sat Oct 24 01:01:57 2020
+++ src/external/gpl3/gdb/bin/gdb/Makefile	Sat Dec  5 22:28:25 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.19 2020/10/24 05:01:57 kamil Exp $
+#	$NetBSD: Makefile,v 1.20 2020/12/06 03:28:25 christos Exp $
 
 NOCTF=
 .include 
@@ -100,8 +100,8 @@ DPADD+=	${LIBOPCODESDIR}/libopcodes.a \
 	${LIBTERMINFO} \
 	${LIBIBERTYDIR}/libiberty.a
 
-LDADD+=		-lexpat -llzma -lz -lcurses -lintl -lm -lkvm -lutil
-DPADD+=		${LIBEXPAT} ${LIBLZMA} ${LIBZ} ${LIBCURSES} ${LIBINTL} ${LIBM} ${LIBKVM} ${LIBUTIL}
+LDADD+=		-lexpat -llzma -lz -lcurses -lintl -lm -lkvm -lutil -lpthread
+DPADD+=		${LIBEXPAT} ${LIBLZMA} ${LIBZ} ${LIBCURSES} ${LIBINTL} ${LIBM} ${LIBKVM} ${LIBUTIL} ${LIBPTHREAD}
 
 .include 
 

Index: src/external/gpl3/gdb/bin/gdbtui/Makefile
diff -u src/external/gpl3/gdb/bin/gdbtui/Makefile:1.13 src/external/gpl3/gdb/bin/gdbtui/Makefile:1.14
--- src/external/gpl3/gdb/bin/gdbtui/Makefile:1.13	Thu Sep 17 16:26:22 2020
+++ src/external/gpl3/gdb/bin/gdbtui/Makefile	Sat Dec  5 22:28:26 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2020/09/17 20:26:22 christos Exp $
+#	$NetBSD: Makefile,v 1.14 2020/12/06 03:28:26 christos Exp $
 NOCTF=
 .include "../Makefile.inc"
 
@@ -84,8 +84,8 @@ DPADD+=	${LIBOPCODESDIR}/libopcodes.a \
 	${LIBTERMINFO} \
 	${LIBIBERTYDIR}/libiberty.a
 
-LDADD+=		-lexpat -llzma -lz -lcurses -lintl -lm -lkvm -lutil
-DPADD+=		${LIBEXPAT} ${LIBLZMA} ${LIBZ} ${LIBCURSES} ${LIBINTL} ${LIBM} ${LIBKVM} ${LIBUTIL}
+LDADD+=		-lexpat -llzma -lz -lcurses -lintl -lm -lkvm -lutil -lpthread
+DPADD+=		${LIBEXPAT} ${LIBLZMA} ${LIBZ} ${LIBCURSES} ${LIBINTL} ${LIBM} ${LIBKVM} ${LIBUTIL} ${LIBPTHREAD}
 
 .PATH: ${DIST}/gdb ${DIST}/gdb/mi ${DIST}/gdb/cli ${DIST}/gdb/tui \
 ${DIST}/gdb/signals ${DIST}/gdb/doc ${.CURDIR}/../arch/${GDB_MACHINE_ARCH}

CVS commit: src/external/gpl3/gdb/bin

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Dec  6 03:28:26 UTC 2020

Modified Files:
src/external/gpl3/gdb/bin/gdb: Makefile
src/external/gpl3/gdb/bin/gdbtui: Makefile

Log Message:
need -lpthread for sun2


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/gpl3/gdb/bin/gdb/Makefile
cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gdb/bin/gdbtui/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/sparc/include

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Dec  6 03:19:15 UTC 2020

Modified Files:
src/sys/arch/sparc/include: types.h

Log Message:
undo previous; __register_t is already defined


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/sparc/include/types.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/sparc/include/types.h
diff -u src/sys/arch/sparc/include/types.h:1.69 src/sys/arch/sparc/include/types.h:1.70
--- src/sys/arch/sparc/include/types.h:1.69	Sat Dec  5 21:23:12 2020
+++ src/sys/arch/sparc/include/types.h	Sat Dec  5 22:19:14 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: types.h,v 1.69 2020/12/06 02:23:12 christos Exp $ */
+/*	$NetBSD: types.h,v 1.70 2020/12/06 03:19:14 christos Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -57,10 +57,9 @@
 #include 
 #include 
 
-typedef unsigned long int	__register_t;
 /* The following are unsigned to prevent annoying sign extended pointers. */
 #if defined(_KERNEL) || defined(_KMEMUSER) || defined(_KERNTYPES) || defined(_STANDALONE)
-typedef __register_t		register_t;
+typedef unsigned long int	register_t;
 #define	PRIxREGISTER		"lx"
 typedef unsigned int		register32_t;
 #define	PRIxREGISTER32		"x"

CVS commit: src/sys/arch/sparc/include

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Dec  6 03:19:15 UTC 2020

Modified Files:
src/sys/arch/sparc/include: types.h

Log Message:
undo previous; __register_t is already defined


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/sparc/include/types.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Sun Dec  6 02:57:31 UTC 2020

Modified Files:
src/etc: MAKEDEV.tmpl
src/etc/etc.aarch64: MAKEDEV.conf
src/etc/etc.amd64: MAKEDEV.conf
src/etc/etc.i386: MAKEDEV.conf
src/etc/etc.ia64: MAKEDEV.conf
src/share/man/man4: acpi.4
src/sys/conf: majors
src/sys/dev/acpi: files.acpi
src/usr.sbin/acpitools/acpidump: acpi_user.c acpidump.8 acpidump.c
Added Files:
src/sys/dev/acpi: acpi_dev.c

Log Message:
acpi: add character device for accessing ACPI tables

The /dev/acpi character device gives an aperture into physical memory
that allows only read access to known ACPI tables: RSDP, XSDT/RSDT, and
the root tables. Adapt acpidump(8) to use this interface by default,
falling back to the old /dev/mem method if it is not available or if
ACPIDUMP_USE_DEVMEM=1 is set in the environment. The user visible benefit
of this change is that "options INSECURE" is no longer required to
dump ACPI tables.


To generate a diff of this commit:
cvs rdiff -u -r1.221 -r1.222 src/etc/MAKEDEV.tmpl
cvs rdiff -u -r1.7 -r1.8 src/etc/etc.aarch64/MAKEDEV.conf
cvs rdiff -u -r1.31 -r1.32 src/etc/etc.amd64/MAKEDEV.conf
cvs rdiff -u -r1.32 -r1.33 src/etc/etc.i386/MAKEDEV.conf
cvs rdiff -u -r1.4 -r1.5 src/etc/etc.ia64/MAKEDEV.conf
cvs rdiff -u -r1.86 -r1.87 src/share/man/man4/acpi.4
cvs rdiff -u -r1.96 -r1.97 src/sys/conf/majors
cvs rdiff -u -r0 -r1.1 src/sys/dev/acpi/acpi_dev.c
cvs rdiff -u -r1.115 -r1.116 src/sys/dev/acpi/files.acpi
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/acpitools/acpidump/acpi_user.c
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/acpitools/acpidump/acpidump.8
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/acpitools/acpidump/acpidump.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/MAKEDEV.tmpl
diff -u src/etc/MAKEDEV.tmpl:1.221 src/etc/MAKEDEV.tmpl:1.222
--- src/etc/MAKEDEV.tmpl:1.221	Sun Jul 26 15:47:27 2020
+++ src/etc/MAKEDEV.tmpl	Sun Dec  6 02:57:29 2020
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$NetBSD: MAKEDEV.tmpl,v 1.221 2020/07/26 15:47:27 jdolecek Exp $
+#	$NetBSD: MAKEDEV.tmpl,v 1.222 2020/12/06 02:57:29 jmcneill Exp $
 #
 # Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -2243,6 +2243,10 @@ xmm[0-9])
 	mkdev ttyXMM${unit}1 c %wwanc_chr% $(($unit * 65536 + 4))
 	;;
 
+acpi)
+	mkdev acpi c %acpi_chr% 0
+	;;
+
 midevend)
 %MI_DEVICES_END%
 local)

Index: src/etc/etc.aarch64/MAKEDEV.conf
diff -u src/etc/etc.aarch64/MAKEDEV.conf:1.7 src/etc/etc.aarch64/MAKEDEV.conf:1.8
--- src/etc/etc.aarch64/MAKEDEV.conf:1.7	Sat Dec 15 01:02:58 2018
+++ src/etc/etc.aarch64/MAKEDEV.conf	Sun Dec  6 02:57:30 2020
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.7 2018/12/15 01:02:58 jmcneill Exp $
+# $NetBSD: MAKEDEV.conf,v 1.8 2020/12/06 02:57:30 jmcneill Exp $
 
 all_md)
 	makedev wscons fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3
@@ -20,6 +20,7 @@ all_md)
 	makedev spiflash0
 	makedev bpf
 	makedev openfirm
+	makedev acpi
 	;;
 
 ramdisk|floppy)

Index: src/etc/etc.amd64/MAKEDEV.conf
diff -u src/etc/etc.amd64/MAKEDEV.conf:1.31 src/etc/etc.amd64/MAKEDEV.conf:1.32
--- src/etc/etc.amd64/MAKEDEV.conf:1.31	Mon Aug  3 04:32:13 2020
+++ src/etc/etc.amd64/MAKEDEV.conf	Sun Dec  6 02:57:30 2020
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.31 2020/08/03 04:32:13 nia Exp $
+# $NetBSD: MAKEDEV.conf,v 1.32 2020/12/06 02:57:30 jmcneill Exp $
 
 # As of 2003-04-17, the "init" case must not create more than 890 entries.
 all_md)
@@ -45,6 +45,7 @@ all_md)
 	makedev kttcp
 	makedev bio
 	makedev xmm0
+	makedev acpi
 	;;
 
 xen)

Index: src/etc/etc.i386/MAKEDEV.conf
diff -u src/etc/etc.i386/MAKEDEV.conf:1.32 src/etc/etc.i386/MAKEDEV.conf:1.33
--- src/etc/etc.i386/MAKEDEV.conf:1.32	Mon Aug  3 04:32:13 2020
+++ src/etc/etc.i386/MAKEDEV.conf	Sun Dec  6 02:57:30 2020
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.32 2020/08/03 04:32:13 nia Exp $
+# $NetBSD: MAKEDEV.conf,v 1.33 2020/12/06 02:57:30 jmcneill Exp $
 
 # As of 2005-03-15, the "init" case must not create more than 1024 entries.
 all_md)
@@ -49,6 +49,7 @@ all_md)
 	makedev io
 	makedev bio
 	makedev cfs
+	makedev acpi
 	;;
 
 xen)

Index: src/etc/etc.ia64/MAKEDEV.conf
diff -u src/etc/etc.ia64/MAKEDEV.conf:1.4 src/etc/etc.ia64/MAKEDEV.conf:1.5
--- src/etc/etc.ia64/MAKEDEV.conf:1.4	Sun Apr  5 14:09:18 2020
+++ src/etc/etc.ia64/MAKEDEV.conf	Sun Dec  6 02:57:30 2020
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.4 2020/04/05 14:09:18 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.5 2020/12/06 02:57:30 jmcneill Exp $
 
 # As of 2005-03-15, the "init" case must not create more than 1024 entries.
 all_md)
@@ -43,4 +43,5 @@ all_md)
 	makedev io
 	makedev bio
 	makedev cfs
+	makedev acpi
 	;;

Index: src/share/man/man4/acpi.4
diff -u src/share/man/man4/acpi.4:1.86 src/share/man/man4/acpi.4:1.87
--- src/share/man/man4/acpi.4:1.86	Sun Mar  4 02:10:26 2018
+++ src/share/man/man4/acpi.4	

CVS commit: src

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Sun Dec  6 02:57:31 UTC 2020

Modified Files:
src/etc: MAKEDEV.tmpl
src/etc/etc.aarch64: MAKEDEV.conf
src/etc/etc.amd64: MAKEDEV.conf
src/etc/etc.i386: MAKEDEV.conf
src/etc/etc.ia64: MAKEDEV.conf
src/share/man/man4: acpi.4
src/sys/conf: majors
src/sys/dev/acpi: files.acpi
src/usr.sbin/acpitools/acpidump: acpi_user.c acpidump.8 acpidump.c
Added Files:
src/sys/dev/acpi: acpi_dev.c

Log Message:
acpi: add character device for accessing ACPI tables

The /dev/acpi character device gives an aperture into physical memory
that allows only read access to known ACPI tables: RSDP, XSDT/RSDT, and
the root tables. Adapt acpidump(8) to use this interface by default,
falling back to the old /dev/mem method if it is not available or if
ACPIDUMP_USE_DEVMEM=1 is set in the environment. The user visible benefit
of this change is that "options INSECURE" is no longer required to
dump ACPI tables.


To generate a diff of this commit:
cvs rdiff -u -r1.221 -r1.222 src/etc/MAKEDEV.tmpl
cvs rdiff -u -r1.7 -r1.8 src/etc/etc.aarch64/MAKEDEV.conf
cvs rdiff -u -r1.31 -r1.32 src/etc/etc.amd64/MAKEDEV.conf
cvs rdiff -u -r1.32 -r1.33 src/etc/etc.i386/MAKEDEV.conf
cvs rdiff -u -r1.4 -r1.5 src/etc/etc.ia64/MAKEDEV.conf
cvs rdiff -u -r1.86 -r1.87 src/share/man/man4/acpi.4
cvs rdiff -u -r1.96 -r1.97 src/sys/conf/majors
cvs rdiff -u -r0 -r1.1 src/sys/dev/acpi/acpi_dev.c
cvs rdiff -u -r1.115 -r1.116 src/sys/dev/acpi/files.acpi
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/acpitools/acpidump/acpi_user.c
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/acpitools/acpidump/acpidump.8
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/acpitools/acpidump/acpidump.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/m68k/include

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Dec  6 02:26:33 UTC 2020

Modified Files:
src/sys/arch/m68k/include: proc.h

Log Message:
Don't expose register_t


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/m68k/include/proc.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/m68k/include/proc.h
diff -u src/sys/arch/m68k/include/proc.h:1.7 src/sys/arch/m68k/include/proc.h:1.8
--- src/sys/arch/m68k/include/proc.h:1.7	Thu Jan 13 21:06:27 2011
+++ src/sys/arch/m68k/include/proc.h	Sat Dec  5 21:26:33 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: proc.h,v 1.7 2011/01/14 02:06:27 rmind Exp $	*/
+/*	$NetBSD: proc.h,v 1.8 2020/12/06 02:26:33 christos Exp $	*/
 
 /*
  * Copyright (c) 1991, 1993
@@ -57,7 +57,7 @@ struct lwp;
  */
 struct mdproc {
 	int	mdp_flags;		/* machine-dependent flags */
-	void	(*md_syscall)(register_t, struct lwp *, struct frame *);
+	void	(*md_syscall)(__register_t, struct lwp *, struct frame *);
 };
 
 /*

CVS commit: src/sys/arch/m68k/include

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Dec  6 02:26:33 UTC 2020

Modified Files:
src/sys/arch/m68k/include: proc.h

Log Message:
Don't expose register_t


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/m68k/include/proc.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Dec  6 02:23:12 UTC 2020

Modified Files:
src/sys/arch/sparc/include: proc.h types.h
src/sys/arch/sparc64/include: proc.h

Log Message:
don't expose register_t


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sparc/include/proc.h
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/sparc/include/types.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sparc64/include/proc.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/sparc/include/proc.h
diff -u src/sys/arch/sparc/include/proc.h:1.19 src/sys/arch/sparc/include/proc.h:1.20
--- src/sys/arch/sparc/include/proc.h:1.19	Thu Jan 13 21:06:31 2011
+++ src/sys/arch/sparc/include/proc.h	Sat Dec  5 21:23:12 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: proc.h,v 1.19 2011/01/14 02:06:31 rmind Exp $ */
+/*	$NetBSD: proc.h,v 1.20 2020/12/06 02:23:12 christos Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -53,7 +53,7 @@ struct mdlwp {
 };
 
 struct mdproc {
-	void	(*md_syscall)(register_t, struct trapframe *, register_t);
+	void	(*md_syscall)(__register_t, struct trapframe *, __register_t);
 	u_long	md_flags;
 };
 

Index: src/sys/arch/sparc/include/types.h
diff -u src/sys/arch/sparc/include/types.h:1.68 src/sys/arch/sparc/include/types.h:1.69
--- src/sys/arch/sparc/include/types.h:1.68	Sun May 17 02:30:44 2020
+++ src/sys/arch/sparc/include/types.h	Sat Dec  5 21:23:12 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: types.h,v 1.68 2020/05/17 06:30:44 martin Exp $ */
+/*	$NetBSD: types.h,v 1.69 2020/12/06 02:23:12 christos Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -57,9 +57,10 @@
 #include 
 #include 
 
+typedef unsigned long int	__register_t;
 /* The following are unsigned to prevent annoying sign extended pointers. */
 #if defined(_KERNEL) || defined(_KMEMUSER) || defined(_KERNTYPES) || defined(_STANDALONE)
-typedef unsigned long int	register_t;
+typedef __register_t		register_t;
 #define	PRIxREGISTER		"lx"
 typedef unsigned int		register32_t;
 #define	PRIxREGISTER32		"x"

Index: src/sys/arch/sparc64/include/proc.h
diff -u src/sys/arch/sparc64/include/proc.h:1.16 src/sys/arch/sparc64/include/proc.h:1.17
--- src/sys/arch/sparc64/include/proc.h:1.16	Sat May 21 21:09:09 2016
+++ src/sys/arch/sparc64/include/proc.h	Sat Dec  5 21:23:12 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: proc.h,v 1.16 2016/05/22 01:09:09 christos Exp $ */
+/*	$NetBSD: proc.h,v 1.17 2020/12/06 02:23:12 christos Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -51,7 +51,7 @@ struct mdlwp {
  * Machine-dependent part of the proc structure for SPARC.
  */
 struct mdproc {
-	void	(*md_syscall)(struct trapframe64 *, register_t, register_t);
+	void	(*md_syscall)(struct trapframe64 *, __register_t, __register_t);
 	u_long	md_flags;
 };
 

CVS commit: src/sys/arch

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Dec  6 02:23:12 UTC 2020

Modified Files:
src/sys/arch/sparc/include: proc.h types.h
src/sys/arch/sparc64/include: proc.h

Log Message:
don't expose register_t


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sparc/include/proc.h
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/sparc/include/types.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sparc64/include/proc.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/xorg-server.old/dist/xkb

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Dec  5 23:36:45 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server.old/dist/xkb: xkb.c

Log Message:
merge security fixes for xkb, as found in these xserver gitlab
commits:

270e439739e023463e7e0719a4eede69d45f7a3f - xkb: only swap once in XkbSetMap
446ff2d3177087b8173fa779fa5b77a2a128988b - Check SetMap request length carefully
87c64fc5b0db9f62f4e361444f4b60501ebf67b9 - Fix XkbSetDeviceInfo() and 
SetDeviceIndicators() heap overflows
de940e06f8733d87bbb857aef85d830053442cfe - xkb: fix key type index check in 
_XkbSetMapChecks
f7cd1276bbd4fe3a9700096dec33b52b8440788d - Correct bounds checking in 
XkbSetNames()

i haven't tested these run OK, and it was a 33 out of 34 hunks
did not apply cleanly, but they merge was still largely the
same (patch failed due to whitespace changes mostly), and i am
able to build-test successfully.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/xorg-server.old/dist/xkb/xkb.c

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/xorg-server.old/dist/xkb/xkb.c
diff -u xsrc/external/mit/xorg-server.old/dist/xkb/xkb.c:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/xkb/xkb.c:1.2
--- xsrc/external/mit/xorg-server.old/dist/xkb/xkb.c:1.1.1.1	Thu Jun  9 09:08:01 2016
+++ xsrc/external/mit/xorg-server.old/dist/xkb/xkb.c	Sat Dec  5 23:36:45 2020
@@ -151,6 +151,19 @@ static RESTYPE	RT_XKBCLIENT;
 #define	CHK_REQ_KEY_RANGE(err,first,num,r)  \
 	CHK_REQ_KEY_RANGE2(err,first,num,r,client->errorValue,BadValue)
 
+static Bool
+_XkbCheckRequestBounds(ClientPtr client, void *stuff, void *from, void *to) {
+char *cstuff = (char *)stuff;
+char *cfrom = (char *)from;
+char *cto = (char *)to;
+
+return cfrom < cto &&
+   cfrom >= cstuff &&
+   cfrom < cstuff + ((size_t)client->req_len << 2) &&
+   cto >= cstuff &&
+   cto <= cstuff + ((size_t)client->req_len << 2);
+}
+
 /******/
 
 int
@@ -1550,7 +1563,8 @@ CheckKeyTypes(	ClientPtr	client,
 		xkbSetMapReq *	req,
 		xkbKeyTypeWireDesc **wireRtrn,
 		int	 *	nMapsRtrn,
-		CARD8 *		mapWidthRtrn)
+		CARD8 *		mapWidthRtrn,
+		Bool doswap)
 {
 unsigned		nMaps;
 register unsigned	i,n;
@@ -1588,7 +1602,7 @@ register xkbKeyTypeWireDesc	*wire = *wir
 }
 for (i=0;inTypes;i++) {
 	unsigned	width;
-	if (client->swapped) {
+if (client->swapped && doswap) {
 	register int s;
 	swaps(>virtualMods,s);
 	}
@@ -1615,7 +1629,7 @@ register xkbKeyTypeWireDesc	*wire = *wir
 	mapWire= (xkbKTSetMapEntryWireDesc *)[1];
 	preWire= (xkbModsWireDesc *)[wire->nMapEntries];
 	for (n=0;nnMapEntries;n++) {
-		if (client->swapped) {
+if (client->swapped && doswap) {
 		register int s;
 		swaps([n].virtualMods,s);
 		}
@@ -1634,7 +1648,7 @@ register xkbKeyTypeWireDesc	*wire = *wir
 		return 0;
 		}
 		if (wire->preserve) {
-		if (client->swapped) {
+		if (client->swapped && doswap) {
 			register int s;
 			swaps([n].virtualMods,s);
 		}
@@ -1673,7 +1687,8 @@ CheckKeySyms(	ClientPtr		client,
 		CARD8 *	 		mapWidths,
 		CARD16 *	 	symsPerKey,
 		xkbSymMapWireDesc **	wireRtrn,
-		int *			errorRtrn)
+		int *			errorRtrn,
+		Bool			doswap)
 {
 register unsigned	i;
 XkbSymMapPtr		map;
@@ -1685,7 +1700,7 @@ xkbSymMapWireDesc*	wire = *wireRtrn;
 for (i=0;inKeySyms;i++) {
 	KeySym *pSyms;
 	register unsigned nG;
-	if (client->swapped) {
+	if (client->swapped && doswap) {
 	swaps(>nSyms,nG);
 	}
 	nG = XkbNumGroups(wire->groupInfo);
@@ -2322,13 +2337,99 @@ XkbServerMapPtr		srv = xkbi->desc->serve
 }
 return (char *)wire;
 }
+ 
+#define _add_check_len(new) \
+if (len > UINT32_MAX - (new) || len > req_len - (new)) goto bad; \
+else len += new
+
+/**
+ * Check the length of the SetMap request
+ */
+static int
+_XkbSetMapCheckLength(xkbSetMapReq *req)
+{
+size_t len = sz_xkbSetMapReq, req_len = req->length << 2;
+xkbKeyTypeWireDesc *keytype;
+xkbSymMapWireDesc *symmap;
+BOOL preserve;
+int i, map_count, nSyms;
+
+if (req_len < len)
+goto bad;
+/* types */
+if (req->present & XkbKeyTypesMask) {
+keytype = (xkbKeyTypeWireDesc *)(req + 1);
+for (i = 0; i < req->nTypes; i++) {
+_add_check_len(XkbPaddedSize(sz_xkbKeyTypeWireDesc));
+if (req->flags & XkbSetMapResizeTypes) {
+_add_check_len(keytype->nMapEntries
+   * sz_xkbKTSetMapEntryWireDesc);
+preserve = keytype->preserve;
+map_count = keytype->nMapEntries;
+if (preserve) {
+_add_check_len(map_count * sz_xkbModsWireDesc);
+}
+keytype += 1;
+keytype = (xkbKeyTypeWireDesc *)
+  

CVS commit: xsrc/external/mit/xorg-server.old/dist/xkb

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Dec  5 23:36:45 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server.old/dist/xkb: xkb.c

Log Message:
merge security fixes for xkb, as found in these xserver gitlab
commits:

270e439739e023463e7e0719a4eede69d45f7a3f - xkb: only swap once in XkbSetMap
446ff2d3177087b8173fa779fa5b77a2a128988b - Check SetMap request length carefully
87c64fc5b0db9f62f4e361444f4b60501ebf67b9 - Fix XkbSetDeviceInfo() and 
SetDeviceIndicators() heap overflows
de940e06f8733d87bbb857aef85d830053442cfe - xkb: fix key type index check in 
_XkbSetMapChecks
f7cd1276bbd4fe3a9700096dec33b52b8440788d - Correct bounds checking in 
XkbSetNames()

i haven't tested these run OK, and it was a 33 out of 34 hunks
did not apply cleanly, but they merge was still largely the
same (patch failed due to whitespace changes mostly), and i am
able to build-test successfully.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/xorg-server.old/dist/xkb/xkb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/gpl3/gdb/lib

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Dec  5 23:02:26 UTC 2020

Modified Files:
src/external/gpl3/gdb/lib/libbfd/arch/hppa: targmatch.h
src/external/gpl3/gdb/lib/libgdb/arch/hppa: config.h
src/external/gpl3/gdb/lib/libgnulib/arch/hppa/gnulib: config.h
src/external/gpl3/gdb/lib/libgnulib/arch/hppa/gnulib/import: unistd.h

Log Message:
fix hppa


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gdb/lib/libbfd/arch/hppa/targmatch.h
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gdb/lib/libgdb/arch/hppa/config.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gdb/lib/libgnulib/arch/hppa/gnulib/config.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gdb/lib/libgnulib/arch/hppa/gnulib/import/unistd.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gdb/lib/libbfd/arch/hppa/targmatch.h
diff -u src/external/gpl3/gdb/lib/libbfd/arch/hppa/targmatch.h:1.11 src/external/gpl3/gdb/lib/libbfd/arch/hppa/targmatch.h:1.12
--- src/external/gpl3/gdb/lib/libbfd/arch/hppa/targmatch.h:1.11	Sun Sep 20 12:54:16 2020
+++ src/external/gpl3/gdb/lib/libbfd/arch/hppa/targmatch.h	Sat Dec  5 18:02:25 2020
@@ -1,5 +1,5 @@
 /* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-gdb,v 1.12 2020/09/17 16:54:31 christos Exp  */
+/* Generated from: NetBSD: mknative-gdb,v 1.15 2020/12/05 21:27:31 christos Exp  */
 /* Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp  */
 
 #ifdef BFD64
@@ -42,15 +42,6 @@
 
 #if !defined (SELECT_VECS) || defined (HAVE_aarch64_elf64_le_vec)
 
-{ "aarch64-*-netbsd*",
-_elf64_le_vec },
-#endif
-
-
-
-
-#if !defined (SELECT_VECS) || defined (HAVE_aarch64_elf64_le_vec)
-
 { "aarch64-*-fuchsia*",
 _elf64_le_vec },
 #endif
@@ -69,25 +60,7 @@
 
 #if !defined (SELECT_VECS) || defined (HAVE_aarch64_elf64_le_vec)
 
-{ "aarch64-*-linux*",
-_elf64_le_vec },
-#endif
-
-
-
-
-#if !defined (SELECT_VECS) || defined (HAVE_aarch64_elf64_be_vec)
-
-{ "aarch64_be-*-linux*",
-_elf64_be_vec },
-#endif
-
-
-
-
-#if !defined (SELECT_VECS) || defined (HAVE_aarch64_elf64_le_vec)
-
-{ "aarch64-*-netbsd*",
+{ "aarch64-*-linux*", NULL },{ "aarch64-*-netbsd*",
 _elf64_le_vec },
 #endif
 
@@ -96,7 +69,7 @@
 
 #if !defined (SELECT_VECS) || defined (HAVE_aarch64_elf64_be_vec)
 
-{ "aarch64_be-*-netbsd*",
+{ "aarch64_be-*-linux*", NULL },{ "aarch64_be-*-netbsd*",
 _elf64_be_vec },
 #endif
 

Index: src/external/gpl3/gdb/lib/libgdb/arch/hppa/config.h
diff -u src/external/gpl3/gdb/lib/libgdb/arch/hppa/config.h:1.12 src/external/gpl3/gdb/lib/libgdb/arch/hppa/config.h:1.13
--- src/external/gpl3/gdb/lib/libgdb/arch/hppa/config.h:1.12	Sun Sep 20 12:54:21 2020
+++ src/external/gpl3/gdb/lib/libgdb/arch/hppa/config.h	Sat Dec  5 18:02:25 2020
@@ -1,5 +1,5 @@
 /* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-gdb,v 1.12 2020/09/17 16:54:31 christos Exp  */
+/* Generated from: NetBSD: mknative-gdb,v 1.15 2020/12/05 21:27:31 christos Exp  */
 /* Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp  */
 
 /* config.h.  Generated from config.in by configure.  */
@@ -445,7 +445,7 @@
 #define HAVE_STRING_H 1
 
 /* Define to 1 if your system has struct lwp. */
-/* #undef HAVE_STRUCT_LWP */
+#define HAVE_STRUCT_LWP 1
 
 /* Define to 1 if `pl_syscall_code' is a member of `struct ptrace_lwpinfo'. */
 /* #undef HAVE_STRUCT_PTRACE_LWPINFO_PL_SYSCALL_CODE */

Index: src/external/gpl3/gdb/lib/libgnulib/arch/hppa/gnulib/config.h
diff -u src/external/gpl3/gdb/lib/libgnulib/arch/hppa/gnulib/config.h:1.1 src/external/gpl3/gdb/lib/libgnulib/arch/hppa/gnulib/config.h:1.2
--- src/external/gpl3/gdb/lib/libgnulib/arch/hppa/gnulib/config.h:1.1	Sun Sep 20 12:54:25 2020
+++ src/external/gpl3/gdb/lib/libgnulib/arch/hppa/gnulib/config.h	Sat Dec  5 18:02:25 2020
@@ -1,5 +1,5 @@
 /* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-gdb,v 1.12 2020/09/17 16:54:31 christos Exp  */
+/* Generated from: NetBSD: mknative-gdb,v 1.15 2020/12/05 21:27:31 christos Exp  */
 /* Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp  */
 
 /* config.h.  Generated from config.in by configure.  */
@@ -796,7 +796,7 @@
 #define HAVE_SYS_PARAM_H 1
 
 /* Define to 1 if you have the  header file. */
-/* #undef HAVE_SYS_RANDOM_H */
+#define HAVE_SYS_RANDOM_H 1
 
 /* Define to 1 if you have the  header file. */
 #define HAVE_SYS_SOCKET_H 1

Index: src/external/gpl3/gdb/lib/libgnulib/arch/hppa/gnulib/import/unistd.h
diff -u src/external/gpl3/gdb/lib/libgnulib/arch/hppa/gnulib/import/unistd.h:1.1 src/external/gpl3/gdb/lib/libgnulib/arch/hppa/gnulib/import/unistd.h:1.2
--- src/external/gpl3/gdb/lib/libgnulib/arch/hppa/gnulib/import/unistd.h:1.1	Sun Sep 20 12:54:26 2020
+++ 

CVS commit: src/external/gpl3/gdb/lib

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Dec  5 23:02:26 UTC 2020

Modified Files:
src/external/gpl3/gdb/lib/libbfd/arch/hppa: targmatch.h
src/external/gpl3/gdb/lib/libgdb/arch/hppa: config.h
src/external/gpl3/gdb/lib/libgnulib/arch/hppa/gnulib: config.h
src/external/gpl3/gdb/lib/libgnulib/arch/hppa/gnulib/import: unistd.h

Log Message:
fix hppa


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gdb/lib/libbfd/arch/hppa/targmatch.h
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gdb/lib/libgdb/arch/hppa/config.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gdb/lib/libgnulib/arch/hppa/gnulib/config.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gdb/lib/libgnulib/arch/hppa/gnulib/import/unistd.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/usr.bin/make/unit-tests

[Simon J. Gerraty]

Module Name:src
Committed By:   sjg
Date:   Sat Dec  5 22:51:34 UTC 2020

Modified Files:
src/usr.bin/make/unit-tests: meta-cmd-cmp.mk

Log Message:
Don't let gcov mess up results


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/meta-cmd-cmp.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/unit-tests

[Simon J. Gerraty]

Module Name:src
Committed By:   sjg
Date:   Sat Dec  5 22:51:34 UTC 2020

Modified Files:
src/usr.bin/make/unit-tests: meta-cmd-cmp.mk

Log Message:
Don't let gcov mess up results


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/meta-cmd-cmp.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/meta-cmd-cmp.mk
diff -u src/usr.bin/make/unit-tests/meta-cmd-cmp.mk:1.1 src/usr.bin/make/unit-tests/meta-cmd-cmp.mk:1.2
--- src/usr.bin/make/unit-tests/meta-cmd-cmp.mk:1.1	Mon Nov 30 18:32:49 2020
+++ src/usr.bin/make/unit-tests/meta-cmd-cmp.mk	Sat Dec  5 22:51:34 2020
@@ -1,4 +1,4 @@
-# $NetBSD: meta-cmd-cmp.mk,v 1.1 2020/11/30 18:32:49 sjg Exp $
+# $NetBSD: meta-cmd-cmp.mk,v 1.2 2020/12/05 22:51:34 sjg Exp $
 #
 # Tests META_MODE command line comparison
 #
@@ -47,3 +47,6 @@ change1: .PHONY
 change2: .PHONY
 	@echo $@:
 	@${.MAKE} -dM -r -C ${.CURDIR} -f ${MAKEFILE} FLAGS2=changed ${tests}
+
+# don't let gcov mess up the results
+.MAKE.META.IGNORE_PATTERNS+= *.gcda

CVS commit: src/sys/arch/hppa/include

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Dec  5 22:49:50 UTC 2020

Modified Files:
src/sys/arch/hppa/include: proc.h types.h

Log Message:
Use __vaddr_t since we don't expose vaddr_t by default to userland.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hppa/include/proc.h
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/hppa/include/types.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/hppa/include/proc.h
diff -u src/sys/arch/hppa/include/proc.h:1.12 src/sys/arch/hppa/include/proc.h:1.13
--- src/sys/arch/hppa/include/proc.h:1.12	Thu Mar  6 14:02:58 2014
+++ src/sys/arch/hppa/include/proc.h	Sat Dec  5 17:49:50 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: proc.h,v 1.12 2014/03/06 19:02:58 skrll Exp $	*/
+/*	$NetBSD: proc.h,v 1.13 2020/12/05 22:49:50 christos Exp $	*/
 
 /*	$OpenBSD: proc.h,v 1.4 2009/12/29 13:11:40 jsing Exp $ */
 
@@ -44,7 +44,7 @@ struct mdlwp {
 	volatile int	md_astpending;		/* AST pending for this LWP */
 	int		md_flags;		/* machine-dependent flags */
 
-	vaddr_t		md_bpva;
+	__vaddr_t	md_bpva;
 	unsigned int	md_bpsave[2];
 };
 

Index: src/sys/arch/hppa/include/types.h
diff -u src/sys/arch/hppa/include/types.h:1.28 src/sys/arch/hppa/include/types.h:1.29
--- src/sys/arch/hppa/include/types.h:1.28	Thu Apr 16 05:51:57 2020
+++ src/sys/arch/hppa/include/types.h	Sat Dec  5 17:49:50 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: types.h,v 1.28 2020/04/16 09:51:57 skrll Exp $	*/
+/*	$NetBSD: types.h,v 1.29 2020/12/05 22:49:50 christos Exp $	*/
 
 /*	$OpenBSD: types.h,v 1.6 2001/08/11 01:58:34 art Exp $	*/
 
@@ -49,11 +49,13 @@ typedef struct label_t {
 } label_t;
 #endif
 
+typedef	unsigned long		__vaddr_t;
+
 #if defined(_KERNEL) || defined(_KMEMUSER) || defined(_KERNTYPES) || defined(_STANDALONE)
 typedef	unsigned long		hppa_hpa_t;
 typedef	unsigned long		hppa_spa_t;
 typedef	unsigned int		pa_space_t;
-typedef	unsigned long		vaddr_t;
+typedef	__vaddr_t		vaddr_t;
 typedef	unsigned long		vsize_t;
 typedef	unsigned long		paddr_t;
 typedef	unsigned long		psize_t;

CVS commit: src/sys/arch/hppa/include

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Dec  5 22:49:50 UTC 2020

Modified Files:
src/sys/arch/hppa/include: proc.h types.h

Log Message:
Use __vaddr_t since we don't expose vaddr_t by default to userland.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hppa/include/proc.h
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/hppa/include/types.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/share/mk

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sat Dec  5 22:44:57 UTC 2020

Modified Files:
src/share/mk: bsd.x11.mk

Log Message:
bump version for xorg-server 1.20.10.


To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 src/share/mk/bsd.x11.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.136 src/share/mk/bsd.x11.mk:1.137
--- src/share/mk/bsd.x11.mk:1.136	Mon Aug 10 09:23:37 2020
+++ src/share/mk/bsd.x11.mk	Sat Dec  5 22:44:57 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.x11.mk,v 1.136 2020/08/10 09:23:37 mrg Exp $
+#	$NetBSD: bsd.x11.mk,v 1.137 2020/12/05 22:44:57 mrg Exp $
 
 .include 
 
@@ -134,7 +134,7 @@ XORG_SERVER_MINOR=	10
 XORG_SERVER_TEENY=	6
 .else
 XORG_SERVER_MINOR=	20
-XORG_SERVER_TEENY=	6
+XORG_SERVER_TEENY=	10
 .endif
 
 XVENDORNAMESHORT=	'"X.Org"'

CVS commit: src/share/mk

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sat Dec  5 22:44:57 UTC 2020

Modified Files:
src/share/mk: bsd.x11.mk

Log Message:
bump version for xorg-server 1.20.10.


To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 src/share/mk/bsd.x11.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/xorg-server/include

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Dec  5 22:44:37 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/include: dix-config.h version-config.h
xorg-config.h xorg-server.h

Log Message:
bump version for xorg-server 1.20.10.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xorg-server/include/version-config.h
cvs rdiff -u -r1.20 -r1.21 \
xsrc/external/mit/xorg-server/include/xorg-config.h \
xsrc/external/mit/xorg-server/include/xorg-server.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/xorg-server/include/dix-config.h
diff -u xsrc/external/mit/xorg-server/include/dix-config.h:1.39 xsrc/external/mit/xorg-server/include/dix-config.h:1.40
--- xsrc/external/mit/xorg-server/include/dix-config.h:1.39	Sat Dec  5 20:34:05 2020
+++ xsrc/external/mit/xorg-server/include/dix-config.h	Sat Dec  5 22:44:37 2020
@@ -358,7 +358,7 @@
 #define XINERAMA 1
 
 /* Current Xorg version */
-#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((6) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((10) * 1000) + 0)
 
 /* Build Xv Extension */
 #define XvExtension 1

Index: xsrc/external/mit/xorg-server/include/version-config.h
diff -u xsrc/external/mit/xorg-server/include/version-config.h:1.10 xsrc/external/mit/xorg-server/include/version-config.h:1.11
--- xsrc/external/mit/xorg-server/include/version-config.h:1.10	Sun Feb 23 11:09:41 2020
+++ xsrc/external/mit/xorg-server/include/version-config.h	Sat Dec  5 22:44:37 2020
@@ -5,13 +5,13 @@
 #define VERSION_CONFIG_H
 
 /* Vendor man version */
-#define VENDOR_MAN_VERSION "Version 1.20.6"
+#define VENDOR_MAN_VERSION "Version 1.20.10"
 
 /* Vendor name */
 /* #define VENDOR_NAME "The X.Org Foundation" */
 
 /* Vendor release */
-#define VENDOR_RELEASE (((1) * 1000) + ((20) * 10) + ((6) * 1000) + 0)
+#define VENDOR_RELEASE (((1) * 1000) + ((20) * 10) + ((10) * 1000) + 0)
 
 #endif /* VERSION_CONFIG_H */
 

Index: xsrc/external/mit/xorg-server/include/xorg-config.h
diff -u xsrc/external/mit/xorg-server/include/xorg-config.h:1.20 xsrc/external/mit/xorg-server/include/xorg-config.h:1.21
--- xsrc/external/mit/xorg-server/include/xorg-config.h:1.20	Sun Feb 23 10:26:56 2020
+++ xsrc/external/mit/xorg-server/include/xorg-config.h	Sat Dec  5 22:44:37 2020
@@ -17,7 +17,7 @@
 #define XORGSERVER 1
 
 /* Current X.Org version. */
-#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((6) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((10) * 1000) + 0)
 
 /* Name of X server. */
 #define __XSERVERNAME__ "Xorg"
Index: xsrc/external/mit/xorg-server/include/xorg-server.h
diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.20 xsrc/external/mit/xorg-server/include/xorg-server.h:1.21
--- xsrc/external/mit/xorg-server/include/xorg-server.h:1.20	Sun Feb 23 10:58:12 2020
+++ xsrc/external/mit/xorg-server/include/xorg-server.h	Sat Dec  5 22:44:37 2020
@@ -140,7 +140,7 @@
 #define XORGSERVER 1
 
 /* Current Xorg version */
-#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((6) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((10) * 1000) + 0)
 
 /* Build Xv Extension */
 #define XvExtension 1

CVS commit: xsrc/external/mit/xorg-server/include

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Dec  5 22:44:37 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/include: dix-config.h version-config.h
xorg-config.h xorg-server.h

Log Message:
bump version for xorg-server 1.20.10.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xorg-server/include/version-config.h
cvs rdiff -u -r1.20 -r1.21 \
xsrc/external/mit/xorg-server/include/xorg-config.h \
xsrc/external/mit/xorg-server/include/xorg-server.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/gpl3/gdb/dist/gdb

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Dec  5 22:24:26 UTC 2020

Modified Files:
src/external/gpl3/gdb/dist/gdb: arm-nbsd-nat.c

Log Message:
fix arm build


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gdb/dist/gdb/arm-nbsd-nat.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gdb/dist/gdb/arm-nbsd-nat.c
diff -u src/external/gpl3/gdb/dist/gdb/arm-nbsd-nat.c:1.14 src/external/gpl3/gdb/dist/gdb/arm-nbsd-nat.c:1.15
--- src/external/gpl3/gdb/dist/gdb/arm-nbsd-nat.c:1.14	Mon Sep 14 22:05:18 2020
+++ src/external/gpl3/gdb/dist/gdb/arm-nbsd-nat.c	Sat Dec  5 17:24:26 2020
@@ -18,7 +18,6 @@
along with this program.  If not, see .  */
 
 /* We define this to get types like register_t.  */
-#define _KERNTYPES
 #include "defs.h"
 #include "gdbcore.h"
 #include "inferior.h"
@@ -52,7 +51,7 @@ public:
   const struct target_desc *read_description () override;
 };
 
-static arm_nbsd_nat_target the_arm_nbsd_nat_target;
+static arm_netbsd_nat_target the_arm_netbsd_nat_target;
 
 /* Determine if PT_GETREGS fetches REGNUM.  */
 
@@ -72,8 +71,6 @@ getfpregs_supplies (int regnum)
 	  || regnum == ARM_FPSCR_REGNUM);
 }
 
-extern int arm_apcs_32;
-
 static int
 armnbsd_supply_pcb (struct regcache *regcache, struct pcb *pcb)
 {
@@ -142,18 +139,16 @@ fetch_register (struct regcache *regcach
   pid_t pid = ptid.pid ();
   int lwp = ptid.lwp ();
   int ret;
-  int lwp = regcache->ptid ().lwp ();
 
   ret = ptrace (PT_GETREGS, regcache->ptid ().pid (),
-		(PTRACE_TYPE_ARG3) _registers, lwp);
+		(PTRACE_TYPE_ARG3) , lwp);
 
   if (ret < 0)
 {
   warning (_("unable to fetch general register"));
   return;
 }
-  arm_nbsd_supply_gregset (nullptr, regcache, regno, _registers,
-			   sizeof (inferior_registers));
+  arm_nbsd_supply_gregset (nullptr, regcache, regno, , sizeof (regs));
 }
 
 static void
@@ -229,15 +224,14 @@ static void
 store_register (const struct regcache *regcache, int regno)
 {
   struct gdbarch *gdbarch = regcache->arch ();
-  struct reg inferior_registers;
-  int lwp = regcache->ptid ().lwp ();
+  struct reg regs;
   int ret;
   ptid_t ptid = regcache->ptid ();
   pid_t pid = ptid.pid ();
   int lwp = ptid.lwp ();
 
   ret = ptrace (PT_GETREGS, regcache->ptid ().pid (),
-		(PTRACE_TYPE_ARG3) _registers, lwp);
+		(PTRACE_TYPE_ARG3) , lwp);
 
   if (ret < 0)
 {
@@ -291,7 +285,7 @@ store_register (const struct regcache *r
 }
 
   ret = ptrace (PT_SETREGS, regcache->ptid ().pid (),
-		(PTRACE_TYPE_ARG3) _registers, lwp);
+		(PTRACE_TYPE_ARG3) , lwp);
 
   if (ret < 0)
 warning (_("unable to write register %d to inferior"), regno);
@@ -301,7 +295,7 @@ static void
 store_regs (const struct regcache *regcache)
 {
   struct gdbarch *gdbarch = regcache->arch ();
-  struct reg inferior_registers;
+  struct reg regs;
   int lwp = regcache->ptid ().lwp ();
   int ret;
   int regno;
@@ -333,7 +327,7 @@ store_regs (const struct regcache *regca
 }
 
   ret = ptrace (PT_SETREGS, regcache->ptid ().pid (),
-		(PTRACE_TYPE_ARG3) _registers, lwp);
+		(PTRACE_TYPE_ARG3) , lwp);
 
   if (ret < 0)
 warning (_("unable to store general registers"));
@@ -438,5 +432,6 @@ _initialize_arm_netbsd_nat ()
   /* Support debugging kernel virtual memory images.  */
   bsd_kvm_add_target (armnbsd_supply_pcb);
 
+/*###436 [cc] note: suggested alternative: 'the_arm_nbsd_nat_target'%%%*/
   add_inf_child_target (_arm_netbsd_nat_target);
 }

CVS commit: src/external/gpl3/gdb/dist/gdb

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Dec  5 22:24:26 UTC 2020

Modified Files:
src/external/gpl3/gdb/dist/gdb: arm-nbsd-nat.c

Log Message:
fix arm build


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gdb/dist/gdb/arm-nbsd-nat.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/gpl3/gdb

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Dec  5 22:14:45 UTC 2020

Modified Files:
src/external/gpl3/gdb/dist/gdb: alpha-bsd-nat.c alpha-nbsd-tdep.c
arm-nbsd-tdep.c nbsd-nat.c
src/external/gpl3/gdb/lib/libbfd/arch/alpha: bfd_stdint.h targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/armeb: bfd_stdint.h targmatch.h
src/external/gpl3/gdb/lib/libdecnumber/arch/alpha: gstdint.h
src/external/gpl3/gdb/lib/libdecnumber/arch/armeb: gstdint.h
src/external/gpl3/gdb/lib/libgdb/arch/alpha: defs.mk
src/external/gpl3/gdb/lib/libgdb/arch/armeb: defs.mk version.c
src/external/gpl3/gdb/lib/libgnulib/arch/alpha: defs.mk
src/external/gpl3/gdb/lib/libgnulib/arch/alpha/gnulib: config.h
src/external/gpl3/gdb/lib/libgnulib/arch/alpha/gnulib/import: unistd.h
src/external/gpl3/gdb/lib/libgnulib/arch/armeb: defs.mk
src/external/gpl3/gdb/lib/libgnulib/arch/armeb/gnulib: config.h
src/external/gpl3/gdb/lib/libgnulib/arch/armeb/gnulib/import: unistd.h

Log Message:
fix alpha build.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gdb/dist/gdb/alpha-bsd-nat.c
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gdb/dist/gdb/arm-nbsd-tdep.c
cvs rdiff -u -r1.18 -r1.19 src/external/gpl3/gdb/dist/gdb/nbsd-nat.c
cvs rdiff -u -r1.9 -r1.10 \
src/external/gpl3/gdb/lib/libbfd/arch/alpha/bfd_stdint.h
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gdb/lib/libbfd/arch/alpha/targmatch.h
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gdb/lib/libbfd/arch/armeb/bfd_stdint.h \
src/external/gpl3/gdb/lib/libbfd/arch/armeb/targmatch.h
cvs rdiff -u -r1.9 -r1.10 \
src/external/gpl3/gdb/lib/libdecnumber/arch/alpha/gstdint.h
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gdb/lib/libdecnumber/arch/armeb/gstdint.h
cvs rdiff -u -r1.14 -r1.15 \
src/external/gpl3/gdb/lib/libgdb/arch/alpha/defs.mk
cvs rdiff -u -r1.15 -r1.16 \
src/external/gpl3/gdb/lib/libgdb/arch/armeb/defs.mk
cvs rdiff -u -r1.10 -r1.11 \
src/external/gpl3/gdb/lib/libgdb/arch/armeb/version.c
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gdb/lib/libgnulib/arch/alpha/defs.mk
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gdb/lib/libgnulib/arch/alpha/gnulib/config.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gdb/lib/libgnulib/arch/alpha/gnulib/import/unistd.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gdb/lib/libgnulib/arch/armeb/defs.mk
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gdb/lib/libgnulib/arch/armeb/gnulib/config.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gdb/lib/libgnulib/arch/armeb/gnulib/import/unistd.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gdb/dist/gdb/alpha-bsd-nat.c
diff -u src/external/gpl3/gdb/dist/gdb/alpha-bsd-nat.c:1.10 src/external/gpl3/gdb/dist/gdb/alpha-bsd-nat.c:1.11
--- src/external/gpl3/gdb/dist/gdb/alpha-bsd-nat.c:1.10	Mon Sep 14 22:05:18 2020
+++ src/external/gpl3/gdb/dist/gdb/alpha-bsd-nat.c	Sat Dec  5 17:14:44 2020
@@ -18,7 +18,6 @@
along with this program.  If not, see .  */
 
 /* We define this to get types like register_t.  */
-#define _KERNTYPES
 #include "defs.h"
 #include "inferior.h"
 #include "regcache.h"

Index: src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c
diff -u src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c:1.8 src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c:1.9
--- src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c:1.8	Mon Sep 14 22:05:18 2020
+++ src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c	Sat Dec  5 17:14:44 2020
@@ -22,6 +22,7 @@
 #include "defs.h"
 #include "frame.h"
 #include "gdbcore.h"
+#include "gdbarch.h"
 #include "osabi.h"
 #include "regcache.h"
 #include "regset.h"
@@ -336,7 +337,6 @@ alphanbsd_init_abi (struct gdbarch_info 
   /* NetBSD/alpha has SVR4-style shared libraries.  */
   set_solib_svr4_fetch_link_map_offsets
 (gdbarch, svr4_lp64_fetch_link_map_offsets);
-  set_gdbarch_skip_solib_resolver (gdbarch, nbsd_skip_solib_resolver);
 
 #ifdef notyet
   tdep->dynamic_sigtramp_offset = alphanbsd_sigtramp_offset;

Index: src/external/gpl3/gdb/dist/gdb/arm-nbsd-tdep.c
diff -u src/external/gpl3/gdb/dist/gdb/arm-nbsd-tdep.c:1.6 src/external/gpl3/gdb/dist/gdb/arm-nbsd-tdep.c:1.7
--- src/external/gpl3/gdb/dist/gdb/arm-nbsd-tdep.c:1.6	Mon Sep 14 22:05:18 2020
+++ src/external/gpl3/gdb/dist/gdb/arm-nbsd-tdep.c	Sat Dec  5 17:14:44 2020
@@ -166,9 +166,6 @@ arm_netbsd_elf_init_abi (struct gdbarch_
   /* NetBSD ELF uses SVR4-style shared libraries.  */
   set_solib_svr4_fetch_link_map_offsets
 (gdbarch, svr4_ilp32_fetch_link_map_offsets);
-
-  /* for single stepping; see PR/50773 */
-  set_gdbarch_skip_solib_resolver (gdbarch, nbsd_skip_solib_resolver);
 }
 
 void _initialize_arm_netbsd_tdep 

CVS commit: src/external/gpl3/gdb

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Dec  5 22:14:45 UTC 2020

Modified Files:
src/external/gpl3/gdb/dist/gdb: alpha-bsd-nat.c alpha-nbsd-tdep.c
arm-nbsd-tdep.c nbsd-nat.c
src/external/gpl3/gdb/lib/libbfd/arch/alpha: bfd_stdint.h targmatch.h
src/external/gpl3/gdb/lib/libbfd/arch/armeb: bfd_stdint.h targmatch.h
src/external/gpl3/gdb/lib/libdecnumber/arch/alpha: gstdint.h
src/external/gpl3/gdb/lib/libdecnumber/arch/armeb: gstdint.h
src/external/gpl3/gdb/lib/libgdb/arch/alpha: defs.mk
src/external/gpl3/gdb/lib/libgdb/arch/armeb: defs.mk version.c
src/external/gpl3/gdb/lib/libgnulib/arch/alpha: defs.mk
src/external/gpl3/gdb/lib/libgnulib/arch/alpha/gnulib: config.h
src/external/gpl3/gdb/lib/libgnulib/arch/alpha/gnulib/import: unistd.h
src/external/gpl3/gdb/lib/libgnulib/arch/armeb: defs.mk
src/external/gpl3/gdb/lib/libgnulib/arch/armeb/gnulib: config.h
src/external/gpl3/gdb/lib/libgnulib/arch/armeb/gnulib/import: unistd.h

Log Message:
fix alpha build.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gdb/dist/gdb/alpha-bsd-nat.c
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gdb/dist/gdb/arm-nbsd-tdep.c
cvs rdiff -u -r1.18 -r1.19 src/external/gpl3/gdb/dist/gdb/nbsd-nat.c
cvs rdiff -u -r1.9 -r1.10 \
src/external/gpl3/gdb/lib/libbfd/arch/alpha/bfd_stdint.h
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gdb/lib/libbfd/arch/alpha/targmatch.h
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gdb/lib/libbfd/arch/armeb/bfd_stdint.h \
src/external/gpl3/gdb/lib/libbfd/arch/armeb/targmatch.h
cvs rdiff -u -r1.9 -r1.10 \
src/external/gpl3/gdb/lib/libdecnumber/arch/alpha/gstdint.h
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gdb/lib/libdecnumber/arch/armeb/gstdint.h
cvs rdiff -u -r1.14 -r1.15 \
src/external/gpl3/gdb/lib/libgdb/arch/alpha/defs.mk
cvs rdiff -u -r1.15 -r1.16 \
src/external/gpl3/gdb/lib/libgdb/arch/armeb/defs.mk
cvs rdiff -u -r1.10 -r1.11 \
src/external/gpl3/gdb/lib/libgdb/arch/armeb/version.c
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gdb/lib/libgnulib/arch/alpha/defs.mk
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gdb/lib/libgnulib/arch/alpha/gnulib/config.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gdb/lib/libgnulib/arch/alpha/gnulib/import/unistd.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gdb/lib/libgnulib/arch/armeb/defs.mk
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gdb/lib/libgnulib/arch/armeb/gnulib/config.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gdb/lib/libgnulib/arch/armeb/gnulib/import/unistd.h

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/include/xorgproto/X11/extensions

[Nia Alarie]

Module Name:src
Committed By:   nia
Date:   Sat Dec  5 21:36:21 UTC 2020

Modified Files:
src/external/mit/xorg/include/xorgproto/X11/extensions: Makefile

Log Message:
Don't install header marked obsolete

pointed out by mrg


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/include/xorgproto/X11/extensions/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/include/xorgproto/X11/extensions/Makefile
diff -u src/external/mit/xorg/include/xorgproto/X11/extensions/Makefile:1.2 src/external/mit/xorg/include/xorgproto/X11/extensions/Makefile:1.3
--- src/external/mit/xorg/include/xorgproto/X11/extensions/Makefile:1.2	Sun Feb 23 09:10:50 2020
+++ src/external/mit/xorg/include/xorgproto/X11/extensions/Makefile	Sat Dec  5 21:36:21 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2020/02/23 09:10:50 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2020/12/05 21:36:21 nia Exp $
 
 .include 
 
@@ -15,7 +15,6 @@ INCS=	EVI.h \
 	XKBsrv.h \
 	XKBstr.h \
 	XResproto.h \
-	Xeviestr.h \
 	Xv.h \
 	XvMC.h \
 	XvMCproto.h \

CVS commit: src/external/mit/xorg/include/xorgproto/X11/extensions

[Nia Alarie]

Module Name:src
Committed By:   nia
Date:   Sat Dec  5 21:36:21 UTC 2020

Modified Files:
src/external/mit/xorg/include/xorgproto/X11/extensions: Makefile

Log Message:
Don't install header marked obsolete

pointed out by mrg


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/include/xorgproto/X11/extensions/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/tools/gdb

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Dec  5 21:27:31 UTC 2020

Modified Files:
src/tools/gdb: mknative-gdb

Log Message:
Don't bother with gdbserver for archs that don't build it.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/tools/gdb/mknative-gdb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tools/gdb/mknative-gdb
diff -u src/tools/gdb/mknative-gdb:1.14 src/tools/gdb/mknative-gdb:1.15
--- src/tools/gdb/mknative-gdb:1.14	Thu Sep 24 10:53:17 2020
+++ src/tools/gdb/mknative-gdb	Sat Dec  5 16:27:31 2020
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$NetBSD: mknative-gdb,v 1.14 2020/09/24 14:53:17 christos Exp $
+#	$NetBSD: mknative-gdb,v 1.15 2020/12/05 21:27:31 christos Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of src/external/gpl3/gdb
@@ -218,6 +218,10 @@ get_gdb_libgdb () {
 
 get_gdb_bingdbserver () {
 	local _CTF=$_GDB/bin/gdbserver
+
+	if [ ! -f $_CTF/arch/$_MACHINE_SUBDIR/config.h ]; then
+		return
+	fi
 	mkdir -p $_TOP/$_CTF/arch/$_MACHINE_SUBDIR
 
 	write_c $_CTF/arch/$_MACHINE_SUBDIR/config.h \

CVS commit: src/tools/gdb

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Dec  5 21:27:31 UTC 2020

Modified Files:
src/tools/gdb: mknative-gdb

Log Message:
Don't bother with gdbserver for archs that don't build it.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/tools/gdb/mknative-gdb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/gpl3/gdb

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Dec  5 21:27:07 UTC 2020

Modified Files:
src/external/gpl3/gdb/bin: Makefile
src/external/gpl3/gdb/lib/libbfd: Makefile
src/external/gpl3/gdb/lib/libbfd/arch/aarch64: bfd-in3.h bfd.h
bfd_stdint.h bfdver.h config.h defs.mk targmatch.h
src/external/gpl3/gdb/lib/libdecnumber/arch/aarch64: config.h gstdint.h
src/external/gpl3/gdb/lib/libgdb/arch/aarch64: config.h defs.mk init.c
jit-reader.h version.c xml-builtin.c
src/external/gpl3/gdb/lib/libiberty/arch/aarch64: defs.mk
src/external/gpl3/gdb/lib/libopcodes/arch/aarch64: config.h
src/external/gpl3/gdb/lib/libreadline/arch/aarch64: config.h defs.mk

Log Message:
fix and rege aarch64


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/bin/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gdb/lib/libbfd/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gdb/lib/libbfd/arch/aarch64/bfd-in3.h \
src/external/gpl3/gdb/lib/libbfd/arch/aarch64/bfd.h \
src/external/gpl3/gdb/lib/libbfd/arch/aarch64/bfd_stdint.h \
src/external/gpl3/gdb/lib/libbfd/arch/aarch64/bfdver.h \
src/external/gpl3/gdb/lib/libbfd/arch/aarch64/config.h \
src/external/gpl3/gdb/lib/libbfd/arch/aarch64/defs.mk \
src/external/gpl3/gdb/lib/libbfd/arch/aarch64/targmatch.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gdb/lib/libdecnumber/arch/aarch64/config.h \
src/external/gpl3/gdb/lib/libdecnumber/arch/aarch64/gstdint.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gdb/lib/libgdb/arch/aarch64/config.h
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gdb/lib/libgdb/arch/aarch64/defs.mk \
src/external/gpl3/gdb/lib/libgdb/arch/aarch64/init.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gdb/lib/libgdb/arch/aarch64/jit-reader.h \
src/external/gpl3/gdb/lib/libgdb/arch/aarch64/version.c \
src/external/gpl3/gdb/lib/libgdb/arch/aarch64/xml-builtin.c
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gdb/lib/libiberty/arch/aarch64/defs.mk
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gdb/lib/libopcodes/arch/aarch64/config.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gdb/lib/libreadline/arch/aarch64/config.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gdb/lib/libreadline/arch/aarch64/defs.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/gpl3/gdb/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Dec  5 21:26:43 UTC 2020

Modified Files:
src/external/gpl3/gdb/dist/gas: configure.tgt
src/external/gpl3/gdb/dist/ld: configure.tgt
Added Files:
src/external/gpl3/gdb/dist/ld/emulparams: aarch64nbsd.sh
aarch64nbsdb.sh armelf_nbsd_eabi.sh armelf_nbsd_eabihf.sh
armelfb_nbsd_eabi.sh armelfb_nbsd_eabihf.sh elf32_x86_64_nacl.sh
elf32or1k_nbsd.sh elf32ppc_nbsd.sh elf_i386_nacl.sh
elf_x86_64_nacl.sh ppclynx.sh ppcpe.sh tic30aout.sh

Log Message:
add aarch64 bits


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gdb/dist/gas/configure.tgt
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gdb/dist/ld/configure.tgt
cvs rdiff -u -r0 -r1.1 \
src/external/gpl3/gdb/dist/ld/emulparams/aarch64nbsd.sh \
src/external/gpl3/gdb/dist/ld/emulparams/aarch64nbsdb.sh \
src/external/gpl3/gdb/dist/ld/emulparams/armelf_nbsd_eabi.sh \
src/external/gpl3/gdb/dist/ld/emulparams/armelf_nbsd_eabihf.sh \
src/external/gpl3/gdb/dist/ld/emulparams/armelfb_nbsd_eabi.sh \
src/external/gpl3/gdb/dist/ld/emulparams/armelfb_nbsd_eabihf.sh \
src/external/gpl3/gdb/dist/ld/emulparams/elf32_x86_64_nacl.sh \
src/external/gpl3/gdb/dist/ld/emulparams/elf32or1k_nbsd.sh \
src/external/gpl3/gdb/dist/ld/emulparams/elf32ppc_nbsd.sh \
src/external/gpl3/gdb/dist/ld/emulparams/elf_i386_nacl.sh \
src/external/gpl3/gdb/dist/ld/emulparams/elf_x86_64_nacl.sh \
src/external/gpl3/gdb/dist/ld/emulparams/ppclynx.sh \
src/external/gpl3/gdb/dist/ld/emulparams/ppcpe.sh \
src/external/gpl3/gdb/dist/ld/emulparams/tic30aout.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gdb/dist/gas/configure.tgt
diff -u src/external/gpl3/gdb/dist/gas/configure.tgt:1.1.1.1 src/external/gpl3/gdb/dist/gas/configure.tgt:1.2
--- src/external/gpl3/gdb/dist/gas/configure.tgt:1.1.1.1	Mon Sep 14 21:42:20 2020
+++ src/external/gpl3/gdb/dist/gas/configure.tgt	Sat Dec  5 16:26:43 2020
@@ -123,6 +123,7 @@ generic_target=${cpu_type}-$vendor-$os
 case ${generic_target} in
   aarch64*-*-elf*)			fmt=elf;;
   aarch64*-*-fuchsia*)			fmt=elf;;
+  aarch64*-*-netbsd*)   fmt=elf em=nbsd ;;
   aarch64*-*-linux*)			fmt=elf em=linux
 case ${cpu}-${os} in
   aarch64*-linux-gnu_ilp32)		arch=aarch64:32 ;;

Index: src/external/gpl3/gdb/dist/ld/configure.tgt
diff -u src/external/gpl3/gdb/dist/ld/configure.tgt:1.1.1.1 src/external/gpl3/gdb/dist/ld/configure.tgt:1.2
--- src/external/gpl3/gdb/dist/ld/configure.tgt:1.1.1.1	Mon Sep 14 21:43:59 2020
+++ src/external/gpl3/gdb/dist/ld/configure.tgt	Sat Dec  5 16:26:43 2020
@@ -77,6 +77,12 @@ aarch64-*-linux*)	targ_emul=aarch64linux
 			targ_extra_libpath="aarch64linuxb aarch64linux32 aarch64linux32b armelfb_linux_eabi armelf_linux_eabi"
 			targ_extra_emuls="aarch64elf aarch64elf32 aarch64elf32b aarch64elfb armelf armelfb $targ_extra_libpath"
 			;;
+aarch64_be-*-netbsd*)	targ_emul=aarch64nbsdb
+			targ_extra_emuls="aarch64nbsd aarch64elfb aarch64elf armelfb_nbsd_eabihf armelf_nbsd_eabihf armelfb_nbsd_eabi armelf_nbsd_eabi armelfb_nbsd armelf_nbsd armelf armelfb"
+			;;
+aarch64-*-netbsd*)	targ_emul=aarch64nbsd
+			targ_extra_emuls="aarch64nbsdb aarch64elf aarch64elfb armelf_nbsd_eabihf armelfb_nbsd_eabihf armelf_nbsd_eabi armelfb_nbsd_eabi armelf_nbsd armelfb_nbsd armelf armelfb"
+			;;
 alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
 			targ_emul=elf64alpha_fbsd
 			targ_extra_emuls="elf64alpha alpha"

Added files:

Index: src/external/gpl3/gdb/dist/ld/emulparams/aarch64nbsd.sh
diff -u /dev/null src/external/gpl3/gdb/dist/ld/emulparams/aarch64nbsd.sh:1.1
--- /dev/null	Sat Dec  5 16:26:43 2020
+++ src/external/gpl3/gdb/dist/ld/emulparams/aarch64nbsd.sh	Sat Dec  5 16:26:43 2020
@@ -0,0 +1,37 @@
+ARCH=aarch64
+MACHINE=
+NOP=0
+
+SCRIPT_NAME=elf
+ELFSIZE=64
+OUTPUT_FORMAT="elf64-littleaarch64"
+BIG_OUTPUT_FORMAT="elf64-bigaarch64"
+LITTLE_OUTPUT_FORMAT="elf64-littleaarch64"
+NO_REL_RELOCS=yes
+
+TEMPLATE_NAME=elf
+EXTRA_EM_FILE=aarch64elf
+
+GENERATE_SHLIB_SCRIPT=yes
+GENERATE_PIE_SCRIPT=yes
+
+MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
+COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
+SEPARATE_GOTPLT=24
+IREL_IN_PLT=
+
+TEXT_START_ADDR=0x20010
+
+DATA_START_SYMBOLS='PROVIDE (__data_start = .);';
+
+# AArch64 does not support .s* sections.
+NO_SMALL_DATA=yes
+
+OTHER_BSS_SYMBOLS='__bss_start__ = .;'
+OTHER_BSS_END_SYMBOLS='_bss_end__ = . ; __bss_end__ = . ;'
+OTHER_END_SYMBOLS='__end__ = . ;'
+
+OTHER_SECTIONS='.note.gnu.arm.ident 0 : { KEEP (*(.note.gnu.arm.ident)) }'
+ATTRS_SECTIONS='.ARM.attributes 0 : { KEEP (*(.ARM.attributes)) KEEP (*(.gnu.attributes)) }'
+# Ensure each PLT entry is aligned to a cache line.
+PLT=".plt  ${RELOCATING-0} : ALIGN(16) { *(.plt)${IREL_IN_PLT+ *(.iplt)} }"
Index: 

CVS commit: src/external/gpl3/gdb/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Dec  5 21:26:43 UTC 2020

Modified Files:
src/external/gpl3/gdb/dist/gas: configure.tgt
src/external/gpl3/gdb/dist/ld: configure.tgt
Added Files:
src/external/gpl3/gdb/dist/ld/emulparams: aarch64nbsd.sh
aarch64nbsdb.sh armelf_nbsd_eabi.sh armelf_nbsd_eabihf.sh
armelfb_nbsd_eabi.sh armelfb_nbsd_eabihf.sh elf32_x86_64_nacl.sh
elf32or1k_nbsd.sh elf32ppc_nbsd.sh elf_i386_nacl.sh
elf_x86_64_nacl.sh ppclynx.sh ppcpe.sh tic30aout.sh

Log Message:
add aarch64 bits


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gdb/dist/gas/configure.tgt
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gdb/dist/ld/configure.tgt
cvs rdiff -u -r0 -r1.1 \
src/external/gpl3/gdb/dist/ld/emulparams/aarch64nbsd.sh \
src/external/gpl3/gdb/dist/ld/emulparams/aarch64nbsdb.sh \
src/external/gpl3/gdb/dist/ld/emulparams/armelf_nbsd_eabi.sh \
src/external/gpl3/gdb/dist/ld/emulparams/armelf_nbsd_eabihf.sh \
src/external/gpl3/gdb/dist/ld/emulparams/armelfb_nbsd_eabi.sh \
src/external/gpl3/gdb/dist/ld/emulparams/armelfb_nbsd_eabihf.sh \
src/external/gpl3/gdb/dist/ld/emulparams/elf32_x86_64_nacl.sh \
src/external/gpl3/gdb/dist/ld/emulparams/elf32or1k_nbsd.sh \
src/external/gpl3/gdb/dist/ld/emulparams/elf32ppc_nbsd.sh \
src/external/gpl3/gdb/dist/ld/emulparams/elf_i386_nacl.sh \
src/external/gpl3/gdb/dist/ld/emulparams/elf_x86_64_nacl.sh \
src/external/gpl3/gdb/dist/ld/emulparams/ppclynx.sh \
src/external/gpl3/gdb/dist/ld/emulparams/ppcpe.sh \
src/external/gpl3/gdb/dist/ld/emulparams/tic30aout.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/xorg-server

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Dec  5 20:34:05 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist: configure configure.ac
xsrc/external/mit/xorg-server/dist/Xi: xichangehierarchy.c
xipassivegrab.c
xsrc/external/mit/xorg-server/dist/dix: devices.c events.c
xsrc/external/mit/xorg-server/dist/exa: exa_accel.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/ddc: xf86DDC.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
driver.c driver.h drmmode_display.c present.c vblank.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
bsd_init.c
xsrc/external/mit/xorg-server/dist/include: dix-config.h.in os.h
xsrc/external/mit/xorg-server/dist/os: backtrace.c io.c
xsrc/external/mit/xorg-server/dist/test/xi1:
protocol-xchangedevicecontrol.c
xsrc/external/mit/xorg-server/dist/test/xi2:
protocol-xigetclientpointer.c protocol-xiquerypointer.c
protocol-xiwarppointer.c
xsrc/external/mit/xorg-server/dist/xkb: xkb.c
xsrc/external/mit/xorg-server/include: dix-config.h

Log Message:
merge xorg-server 1.20.10.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/configure
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/Xi/xichangehierarchy.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/Xi/xipassivegrab.c
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xorg-server/dist/dix/devices.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/dix/events.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/exa/exa_accel.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/ddc/xf86DDC.h
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.c \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.h \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/present.c
cvs rdiff -u -r1.5 -r1.6 \

xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c
 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/vblank.c
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_init.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/include/dix-config.h.in
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xorg-server/dist/include/os.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-server/dist/os/backtrace.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/os/io.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xorg-server/dist/test/xi1/protocol-xchangedevicecontrol.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xigetclientpointer.c \
xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiquerypointer.c \
xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiwarppointer.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/xkb/xkb.c
cvs rdiff -u -r1.38 -r1.39 xsrc/external/mit/xorg-server/include/dix-config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: xsrc/external/mit/xorg-server

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Dec  5 20:34:05 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist: configure configure.ac
xsrc/external/mit/xorg-server/dist/Xi: xichangehierarchy.c
xipassivegrab.c
xsrc/external/mit/xorg-server/dist/dix: devices.c events.c
xsrc/external/mit/xorg-server/dist/exa: exa_accel.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/ddc: xf86DDC.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
driver.c driver.h drmmode_display.c present.c vblank.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
bsd_init.c
xsrc/external/mit/xorg-server/dist/include: dix-config.h.in os.h
xsrc/external/mit/xorg-server/dist/os: backtrace.c io.c
xsrc/external/mit/xorg-server/dist/test/xi1:
protocol-xchangedevicecontrol.c
xsrc/external/mit/xorg-server/dist/test/xi2:
protocol-xigetclientpointer.c protocol-xiquerypointer.c
protocol-xiwarppointer.c
xsrc/external/mit/xorg-server/dist/xkb: xkb.c
xsrc/external/mit/xorg-server/include: dix-config.h

Log Message:
merge xorg-server 1.20.10.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/configure
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/Xi/xichangehierarchy.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/Xi/xipassivegrab.c
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xorg-server/dist/dix/devices.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/dix/events.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/exa/exa_accel.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/ddc/xf86DDC.h
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.c \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.h \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/present.c
cvs rdiff -u -r1.5 -r1.6 \

xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c
 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/vblank.c
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_init.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/include/dix-config.h.in
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xorg-server/dist/include/os.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-server/dist/os/backtrace.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/os/io.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xorg-server/dist/test/xi1/protocol-xchangedevicecontrol.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xigetclientpointer.c \
xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiquerypointer.c \
xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiwarppointer.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/xkb/xkb.c
cvs rdiff -u -r1.38 -r1.39 xsrc/external/mit/xorg-server/include/dix-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/xorg-server/dist/configure
diff -u xsrc/external/mit/xorg-server/dist/configure:1.7 xsrc/external/mit/xorg-server/dist/configure:1.8
--- xsrc/external/mit/xorg-server/dist/configure:1.7	Sun Feb 23 10:26:21 2020
+++ xsrc/external/mit/xorg-server/dist/configure	Sat Dec  5 20:34:03 2020
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xorg-server 1.20.6.
+# Generated by GNU Autoconf 2.69 for xorg-server 1.20.10.
 #
 # Report bugs to .
 #
@@ -651,8 +651,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xorg-server'
 PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='1.20.6'
-PACKAGE_STRING='xorg-server 1.20.6'
+PACKAGE_VERSION='1.20.10'
+PACKAGE_STRING='xorg-server 1.20.10'
 PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/xserver/issues'
 PACKAGE_URL=''
 
@@ -947,6 +947,8 @@ PRESENT_FALSE
 PRESENT_TRUE
 GLX_SYS_LIBS
 GLX_DEFINES
+HASHTABLE_FALSE
+HASHTABLE_TRUE
 GLX_FALSE
 GLX_TRUE
 GL_LIBS
@@ -1236,6 +1238,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -1530,6 +1533,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1782,6 +1786,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
 

CVS import: xsrc/external/mit/xorg-server/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Dec  5 20:28:03 UTC 2020

Update of /cvsroot/xsrc/external/mit/xorg-server/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv8275

Log Message:
initial import of xorg-server-1.20.10

Status:

Vendor Tag: xorg
Release Tags:   xorg-server-1-20-10

U xsrc/external/mit/xorg-server/dist/test-driver
U xsrc/external/mit/xorg-server/dist/compile
U xsrc/external/mit/xorg-server/dist/autogen.sh
U xsrc/external/mit/xorg-server/dist/ChangeLog
U xsrc/external/mit/xorg-server/dist/README.md
C xsrc/external/mit/xorg-server/dist/configure.ac
C xsrc/external/mit/xorg-server/dist/configure
U xsrc/external/mit/xorg-server/dist/Makefile.am
U xsrc/external/mit/xorg-server/dist/manpages.am
U xsrc/external/mit/xorg-server/dist/meson_options.txt
U xsrc/external/mit/xorg-server/dist/ltmain.sh
U xsrc/external/mit/xorg-server/dist/COPYING
U xsrc/external/mit/xorg-server/dist/ylwrap
U xsrc/external/mit/xorg-server/dist/depcomp
U xsrc/external/mit/xorg-server/dist/xserver.ent.in
U xsrc/external/mit/xorg-server/dist/config.guess
U xsrc/external/mit/xorg-server/dist/xorg-server.pc.in
U xsrc/external/mit/xorg-server/dist/missing
U xsrc/external/mit/xorg-server/dist/Makefile.in
U xsrc/external/mit/xorg-server/dist/config.sub
U xsrc/external/mit/xorg-server/dist/meson.build
U xsrc/external/mit/xorg-server/dist/xorg-server.m4
U xsrc/external/mit/xorg-server/dist/docbook.am
U xsrc/external/mit/xorg-server/dist/devbook.am
U xsrc/external/mit/xorg-server/dist/install-sh
U xsrc/external/mit/xorg-server/dist/aclocal.m4
U xsrc/external/mit/xorg-server/dist/INSTALL
U xsrc/external/mit/xorg-server/dist/m4/lt~obsolete.m4
U xsrc/external/mit/xorg-server/dist/m4/ltversion.m4
U xsrc/external/mit/xorg-server/dist/m4/ltsugar.m4
U xsrc/external/mit/xorg-server/dist/m4/ax_pthread.m4
U xsrc/external/mit/xorg-server/dist/m4/ltoptions.m4
U xsrc/external/mit/xorg-server/dist/m4/libtool.m4
U xsrc/external/mit/xorg-server/dist/m4/ac_define_dir.m4
U xsrc/external/mit/xorg-server/dist/test/touch.c
U xsrc/external/mit/xorg-server/dist/test/hashtabletest.c
U xsrc/external/mit/xorg-server/dist/test/Makefile.am
U xsrc/external/mit/xorg-server/dist/test/fixes.c
U xsrc/external/mit/xorg-server/dist/test/README
U xsrc/external/mit/xorg-server/dist/test/string.c
U xsrc/external/mit/xorg-server/dist/test/misc.c
U xsrc/external/mit/xorg-server/dist/test/xtest.c
U xsrc/external/mit/xorg-server/dist/test/simple-xinit.c
U xsrc/external/mit/xorg-server/dist/test/tests.c
U xsrc/external/mit/xorg-server/dist/test/tests.h
U xsrc/external/mit/xorg-server/dist/test/xfree86.c
U xsrc/external/mit/xorg-server/dist/test/Makefile.in
U xsrc/external/mit/xorg-server/dist/test/list.c
U xsrc/external/mit/xorg-server/dist/test/signal-logging.c
U xsrc/external/mit/xorg-server/dist/test/meson.build
U xsrc/external/mit/xorg-server/dist/test/tests-common.h
U xsrc/external/mit/xorg-server/dist/test/tests-common.c
U xsrc/external/mit/xorg-server/dist/test/test_xkb.c
U xsrc/external/mit/xorg-server/dist/test/input.c
U xsrc/external/mit/xorg-server/dist/test/bigreq/request-length.c
U xsrc/external/mit/xorg-server/dist/test/bigreq/meson.build
C xsrc/external/mit/xorg-server/dist/test/xi1/protocol-xchangedevicecontrol.c
U xsrc/external/mit/xorg-server/dist/test/scripts/xvfb-piglit.sh
U xsrc/external/mit/xorg-server/dist/test/scripts/xephyr-glamor-piglit.sh
U xsrc/external/mit/xorg-server/dist/test/scripts/xinit-piglit-session.sh
U xsrc/external/mit/xorg-server/dist/test/scripts/run-piglit.sh
U xsrc/external/mit/xorg-server/dist/test/sync/meson.build
U xsrc/external/mit/xorg-server/dist/test/sync/sync.c
C xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiwarppointer.c
U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xipassivegrabdevice.c
U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiquerydevice.c
U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-common.c
U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiselectevents.c
U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xigetselectedevents.c
U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-common.h
U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiqueryversion.c
U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-eventconvert.c
C xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiquerypointer.c
U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xisetclientpointer.c
U xsrc/external/mit/xorg-server/dist/test/xi2/xi2.c
C xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xigetclientpointer.c
U xsrc/external/mit/xorg-server/dist/glx/glxbyteorder.h
U xsrc/external/mit/xorg-server/dist/glx/indirect_size_get.c
U xsrc/external/mit/xorg-server/dist/glx/Makefile.am
U xsrc/external/mit/xorg-server/dist/glx/rensize.c
U xsrc/external/mit/xorg-server/dist/glx/singlesize.h
U xsrc/external/mit/xorg-server/dist/glx/vnd_dispatch_stubs.c
U xsrc/external/mit/xorg-server/dist/glx/renderpix.c
U 

CVS import: xsrc/external/mit/xorg-server/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sat Dec  5 20:28:03 UTC 2020

Update of /cvsroot/xsrc/external/mit/xorg-server/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv8275

Log Message:
initial import of xorg-server-1.20.10

Status:

Vendor Tag: xorg
Release Tags:   xorg-server-1-20-10

U xsrc/external/mit/xorg-server/dist/test-driver
U xsrc/external/mit/xorg-server/dist/compile
U xsrc/external/mit/xorg-server/dist/autogen.sh
U xsrc/external/mit/xorg-server/dist/ChangeLog
U xsrc/external/mit/xorg-server/dist/README.md
C xsrc/external/mit/xorg-server/dist/configure.ac
C xsrc/external/mit/xorg-server/dist/configure
U xsrc/external/mit/xorg-server/dist/Makefile.am
U xsrc/external/mit/xorg-server/dist/manpages.am
U xsrc/external/mit/xorg-server/dist/meson_options.txt
U xsrc/external/mit/xorg-server/dist/ltmain.sh
U xsrc/external/mit/xorg-server/dist/COPYING
U xsrc/external/mit/xorg-server/dist/ylwrap
U xsrc/external/mit/xorg-server/dist/depcomp
U xsrc/external/mit/xorg-server/dist/xserver.ent.in
U xsrc/external/mit/xorg-server/dist/config.guess
U xsrc/external/mit/xorg-server/dist/xorg-server.pc.in
U xsrc/external/mit/xorg-server/dist/missing
U xsrc/external/mit/xorg-server/dist/Makefile.in
U xsrc/external/mit/xorg-server/dist/config.sub
U xsrc/external/mit/xorg-server/dist/meson.build
U xsrc/external/mit/xorg-server/dist/xorg-server.m4
U xsrc/external/mit/xorg-server/dist/docbook.am
U xsrc/external/mit/xorg-server/dist/devbook.am
U xsrc/external/mit/xorg-server/dist/install-sh
U xsrc/external/mit/xorg-server/dist/aclocal.m4
U xsrc/external/mit/xorg-server/dist/INSTALL
U xsrc/external/mit/xorg-server/dist/m4/lt~obsolete.m4
U xsrc/external/mit/xorg-server/dist/m4/ltversion.m4
U xsrc/external/mit/xorg-server/dist/m4/ltsugar.m4
U xsrc/external/mit/xorg-server/dist/m4/ax_pthread.m4
U xsrc/external/mit/xorg-server/dist/m4/ltoptions.m4
U xsrc/external/mit/xorg-server/dist/m4/libtool.m4
U xsrc/external/mit/xorg-server/dist/m4/ac_define_dir.m4
U xsrc/external/mit/xorg-server/dist/test/touch.c
U xsrc/external/mit/xorg-server/dist/test/hashtabletest.c
U xsrc/external/mit/xorg-server/dist/test/Makefile.am
U xsrc/external/mit/xorg-server/dist/test/fixes.c
U xsrc/external/mit/xorg-server/dist/test/README
U xsrc/external/mit/xorg-server/dist/test/string.c
U xsrc/external/mit/xorg-server/dist/test/misc.c
U xsrc/external/mit/xorg-server/dist/test/xtest.c
U xsrc/external/mit/xorg-server/dist/test/simple-xinit.c
U xsrc/external/mit/xorg-server/dist/test/tests.c
U xsrc/external/mit/xorg-server/dist/test/tests.h
U xsrc/external/mit/xorg-server/dist/test/xfree86.c
U xsrc/external/mit/xorg-server/dist/test/Makefile.in
U xsrc/external/mit/xorg-server/dist/test/list.c
U xsrc/external/mit/xorg-server/dist/test/signal-logging.c
U xsrc/external/mit/xorg-server/dist/test/meson.build
U xsrc/external/mit/xorg-server/dist/test/tests-common.h
U xsrc/external/mit/xorg-server/dist/test/tests-common.c
U xsrc/external/mit/xorg-server/dist/test/test_xkb.c
U xsrc/external/mit/xorg-server/dist/test/input.c
U xsrc/external/mit/xorg-server/dist/test/bigreq/request-length.c
U xsrc/external/mit/xorg-server/dist/test/bigreq/meson.build
C xsrc/external/mit/xorg-server/dist/test/xi1/protocol-xchangedevicecontrol.c
U xsrc/external/mit/xorg-server/dist/test/scripts/xvfb-piglit.sh
U xsrc/external/mit/xorg-server/dist/test/scripts/xephyr-glamor-piglit.sh
U xsrc/external/mit/xorg-server/dist/test/scripts/xinit-piglit-session.sh
U xsrc/external/mit/xorg-server/dist/test/scripts/run-piglit.sh
U xsrc/external/mit/xorg-server/dist/test/sync/meson.build
U xsrc/external/mit/xorg-server/dist/test/sync/sync.c
C xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiwarppointer.c
U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xipassivegrabdevice.c
U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiquerydevice.c
U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-common.c
U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiselectevents.c
U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xigetselectedevents.c
U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-common.h
U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiqueryversion.c
U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-eventconvert.c
C xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiquerypointer.c
U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xisetclientpointer.c
U xsrc/external/mit/xorg-server/dist/test/xi2/xi2.c
C xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xigetclientpointer.c
U xsrc/external/mit/xorg-server/dist/glx/glxbyteorder.h
U xsrc/external/mit/xorg-server/dist/glx/indirect_size_get.c
U xsrc/external/mit/xorg-server/dist/glx/Makefile.am
U xsrc/external/mit/xorg-server/dist/glx/rensize.c
U xsrc/external/mit/xorg-server/dist/glx/singlesize.h
U xsrc/external/mit/xorg-server/dist/glx/vnd_dispatch_stubs.c
U xsrc/external/mit/xorg-server/dist/glx/renderpix.c
U 

CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat Dec  5 19:46:04 UTC 2020

Modified Files:
src/usr.bin/make: parse.c

Log Message:
make(1): indent parse.c with tabs instead of spaces


To generate a diff of this commit:
cvs rdiff -u -r1.468 -r1.469 src/usr.bin/make/parse.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.468 src/usr.bin/make/parse.c:1.469
--- src/usr.bin/make/parse.c:1.468	Sat Dec  5 19:06:51 2020
+++ src/usr.bin/make/parse.c	Sat Dec  5 19:46:04 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: parse.c,v 1.468 2020/12/05 19:06:51 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.469 2020/12/05 19:46:04 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -117,7 +117,7 @@
 #include "pathnames.h"
 
 /*	"@(#)parse.c	8.3 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: parse.c,v 1.468 2020/12/05 19:06:51 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.469 2020/12/05 19:46:04 rillig Exp $");
 
 /* types and constants */
 
@@ -125,62 +125,62 @@ MAKE_RCSID("$NetBSD: parse.c,v 1.468 202
  * Structure for a file being read ("included file")
  */
 typedef struct IFile {
-char *fname;		/* name of file (relative? absolute?) */
-Boolean fromForLoop;	/* simulated .include by the .for loop */
-int lineno;			/* current line number in file */
-int first_lineno;		/* line number of start of text */
-unsigned int cond_depth;	/* 'if' nesting when file opened */
-Boolean depending;		/* state of doing_depend on EOF */
-
-/* The buffer from which the file's content is read. */
-char *buf_freeIt;
-char *buf_ptr;		/* next char to be read */
-char *buf_end;
-
-char *(*nextbuf)(void *, size_t *); /* Function to get more data */
-void *nextbuf_arg;		/* Opaque arg for nextbuf() */
-struct loadedfile *lf;	/* loadedfile object, if any */
+	char *fname;		/* name of file (relative? absolute?) */
+	Boolean fromForLoop;	/* simulated .include by the .for loop */
+	int lineno;		/* current line number in file */
+	int first_lineno;	/* line number of start of text */
+	unsigned int cond_depth; /* 'if' nesting when file opened */
+	Boolean depending;	/* state of doing_depend on EOF */
+
+	/* The buffer from which the file's content is read. */
+	char *buf_freeIt;
+	char *buf_ptr;		/* next char to be read */
+	char *buf_end;
+
+	char *(*nextbuf)(void *, size_t *); /* Function to get more data */
+	void *nextbuf_arg;	/* Opaque arg for nextbuf() */
+	struct loadedfile *lf;	/* loadedfile object, if any */
 } IFile;
 
 /*
  * Tokens for target attributes
  */
 typedef enum ParseSpecial {
-SP_ATTRIBUTE,	/* Generic attribute */
-SP_BEGIN,		/* .BEGIN */
-SP_DEFAULT,		/* .DEFAULT */
-SP_DELETE_ON_ERROR,	/* .DELETE_ON_ERROR */
-SP_END,		/* .END */
-SP_ERROR,		/* .ERROR */
-SP_IGNORE,		/* .IGNORE */
-SP_INCLUDES,	/* .INCLUDES; not mentioned in the manual page */
-SP_INTERRUPT,	/* .INTERRUPT */
-SP_LIBS,		/* .LIBS; not mentioned in the manual page */
-SP_MAIN,		/* .MAIN and we don't have anything user-specified to
-			 * make */
-SP_META,		/* .META */
-SP_MFLAGS,		/* .MFLAGS or .MAKEFLAGS */
-SP_NOMETA,		/* .NOMETA */
-SP_NOMETA_CMP,	/* .NOMETA_CMP */
-SP_NOPATH,		/* .NOPATH */
-SP_NOT,		/* Not special */
-SP_NOTPARALLEL,	/* .NOTPARALLEL or .NO_PARALLEL */
-SP_NULL,		/* .NULL; not mentioned in the manual page */
-SP_OBJDIR,		/* .OBJDIR */
-SP_ORDER,		/* .ORDER */
-SP_PARALLEL,	/* .PARALLEL; not mentioned in the manual page */
-SP_PATH,		/* .PATH or .PATH.suffix */
-SP_PHONY,		/* .PHONY */
+	SP_ATTRIBUTE,	/* Generic attribute */
+	SP_BEGIN,	/* .BEGIN */
+	SP_DEFAULT,	/* .DEFAULT */
+	SP_DELETE_ON_ERROR, /* .DELETE_ON_ERROR */
+	SP_END,		/* .END */
+	SP_ERROR,	/* .ERROR */
+	SP_IGNORE,	/* .IGNORE */
+	SP_INCLUDES,	/* .INCLUDES; not mentioned in the manual page */
+	SP_INTERRUPT,	/* .INTERRUPT */
+	SP_LIBS,	/* .LIBS; not mentioned in the manual page */
+	/* .MAIN and we don't have anything user-specified to make */
+	SP_MAIN,
+	SP_META,	/* .META */
+	SP_MFLAGS,	/* .MFLAGS or .MAKEFLAGS */
+	SP_NOMETA,	/* .NOMETA */
+	SP_NOMETA_CMP,	/* .NOMETA_CMP */
+	SP_NOPATH,	/* .NOPATH */
+	SP_NOT,		/* Not special */
+	SP_NOTPARALLEL,	/* .NOTPARALLEL or .NO_PARALLEL */
+	SP_NULL,	/* .NULL; not mentioned in the manual page */
+	SP_OBJDIR,	/* .OBJDIR */
+	SP_ORDER,	/* .ORDER */
+	SP_PARALLEL,	/* .PARALLEL; not mentioned in the manual page */
+	SP_PATH,	/* .PATH or .PATH.suffix */
+	SP_PHONY,	/* .PHONY */
 #ifdef POSIX
-SP_POSIX,		/* .POSIX; not mentioned in the manual page */
+	SP_POSIX,	/* .POSIX; not mentioned in the manual page */
 #endif
-SP_PRECIOUS,	/* .PRECIOUS */
-SP_SHELL,		/* .SHELL */
-SP_SILENT,		/* .SILENT */
-SP_SINGLESHELL,	/* .SINGLESHELL; not mentioned in the manual page */
-SP_STALE,		/* .STALE */
-SP_SUFFIXES,	/* 

CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat Dec  5 19:46:04 UTC 2020

Modified Files:
src/usr.bin/make: parse.c

Log Message:
make(1): indent parse.c with tabs instead of spaces


To generate a diff of this commit:
cvs rdiff -u -r1.468 -r1.469 src/usr.bin/make/parse.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/rump/librump/rumpkern

[Chuck Silvers]

Module Name:src
Committed By:   chs
Date:   Sat Dec  5 19:08:50 UTC 2020

Modified Files:
src/sys/rump/librump/rumpkern: vm.c

Log Message:
update the rump copy of uvm_page_unbusy() to match the real version,
in particular handle PG_PAGEOUT.  fixes a few atf tests.


To generate a diff of this commit:
cvs rdiff -u -r1.190 -r1.191 src/sys/rump/librump/rumpkern/vm.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/rump/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.190 src/sys/rump/librump/rumpkern/vm.c:1.191
--- src/sys/rump/librump/rumpkern/vm.c:1.190	Thu Jun 11 19:20:46 2020
+++ src/sys/rump/librump/rumpkern/vm.c	Sat Dec  5 19:08:50 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm.c,v 1.190 2020/06/11 19:20:46 ad Exp $	*/
+/*	$NetBSD: vm.c,v 1.191 2020/12/05 19:08:50 chs Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -41,7 +41,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.190 2020/06/11 19:20:46 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.191 2020/12/05 19:08:50 chs Exp $");
 
 #include 
 #include 
@@ -673,26 +673,51 @@ void
 uvm_page_unbusy(struct vm_page **pgs, int npgs)
 {
 	struct vm_page *pg;
-	int i;
+	int i, pageout_done;
 
 	KASSERT(npgs > 0);
-	KASSERT(rw_write_held(pgs[0]->uobject->vmobjlock));
 
+	pageout_done = 0;
 	for (i = 0; i < npgs; i++) {
 		pg = pgs[i];
-		if (pg == NULL)
+		if (pg == NULL || pg == PGO_DONTCARE) {
 			continue;
+		}
 
+#if 0
+		KASSERT(uvm_page_owner_locked_p(pg, true));
+#else
+		/*
+		 * uvm_page_owner_locked_p() is not available in rump,
+		 * and rump doesn't support amaps anyway.
+		 */
+		KASSERT(rw_write_held(pg->uobject->vmobjlock));
+#endif
 		KASSERT(pg->flags & PG_BUSY);
+
+		if (pg->flags & PG_PAGEOUT) {
+			pg->flags &= ~PG_PAGEOUT;
+			pg->flags |= PG_RELEASED;
+			pageout_done++;
+			atomic_inc_uint();
+		}
 		if (pg->flags & PG_RELEASED) {
+			KASSERT(pg->uobject != NULL ||
+			(pg->uanon != NULL && pg->uanon->an_ref > 0));
+			pg->flags &= ~PG_RELEASED;
 			uvm_pagefree(pg);
 		} else {
+			KASSERT((pg->flags & PG_FAKE) == 0);
 			pg->flags &= ~PG_BUSY;
 			uvm_pagelock(pg);
 			uvm_pagewakeup(pg);
 			uvm_pageunlock(pg);
+			UVM_PAGE_OWN(pg, NULL);
 		}
 	}
+	if (pageout_done != 0) {
+		uvm_pageout_done(pageout_done);
+	}
 }
 
 void

CVS commit: src/sys/rump/librump/rumpkern

[Chuck Silvers]

Module Name:src
Committed By:   chs
Date:   Sat Dec  5 19:08:50 UTC 2020

Modified Files:
src/sys/rump/librump/rumpkern: vm.c

Log Message:
update the rump copy of uvm_page_unbusy() to match the real version,
in particular handle PG_PAGEOUT.  fixes a few atf tests.


To generate a diff of this commit:
cvs rdiff -u -r1.190 -r1.191 src/sys/rump/librump/rumpkern/vm.c

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

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat Dec  5 19:06:51 UTC 2020

Modified Files:
src/usr.bin/make: parse.c

Log Message:
make(1): reduce indentation in ParseDependencySourceKeyword


To generate a diff of this commit:
cvs rdiff -u -r1.467 -r1.468 src/usr.bin/make/parse.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.467 src/usr.bin/make/parse.c:1.468
--- src/usr.bin/make/parse.c:1.467	Sat Dec  5 19:03:45 2020
+++ src/usr.bin/make/parse.c	Sat Dec  5 19:06:51 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: parse.c,v 1.467 2020/12/05 19:03:45 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.468 2020/12/05 19:06:51 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -117,7 +117,7 @@
 #include "pathnames.h"
 
 /*	"@(#)parse.c	8.3 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: parse.c,v 1.467 2020/12/05 19:03:45 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.468 2020/12/05 19:06:51 rillig Exp $");
 
 /* types and constants */
 
@@ -882,22 +882,26 @@ ParseDependencySourceWait(Boolean isSpec
 static Boolean
 ParseDependencySourceKeyword(const char *src, ParseSpecial specType)
 {
+	int keywd;
+	GNodeType op;
 
-if (*src == '.' && ch_isupper(src[1])) {
-	int keywd = ParseFindKeyword(src);
-	if (keywd != -1) {
-	GNodeType op = parseKeywords[keywd].op;
-	if (op != 0) {
+	if (*src != '.' || !ch_isupper(src[1]))
+		return FALSE;
+
+	keywd = ParseFindKeyword(src);
+	if (keywd == -1)
+		return FALSE;
+
+	op = parseKeywords[keywd].op;
+	if (op != OP_NONE) {
 		ApplyDependencyOperator(op);
 		return TRUE;
-	}
-	if (parseKeywords[keywd].spec == SP_WAIT) {
-		ParseDependencySourceWait(specType != SP_NOT);
+	}
+	if (parseKeywords[keywd].spec == SP_WAIT) {
+		ParseDependencySourceWait(specType != SP_NOT);
 		return TRUE;
-	}
 	}
-}
-return FALSE;
+	return FALSE;
 }
 
 static void

CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat Dec  5 19:06:51 UTC 2020

Modified Files:
src/usr.bin/make: parse.c

Log Message:
make(1): reduce indentation in ParseDependencySourceKeyword


To generate a diff of this commit:
cvs rdiff -u -r1.467 -r1.468 src/usr.bin/make/parse.c

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

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat Dec  5 19:03:46 UTC 2020

Modified Files:
src/usr.bin/make: parse.c

Log Message:
make(1): extract ParseDependencySourceWait


To generate a diff of this commit:
cvs rdiff -u -r1.466 -r1.467 src/usr.bin/make/parse.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.466 src/usr.bin/make/parse.c:1.467
--- src/usr.bin/make/parse.c:1.466	Sat Dec  5 18:38:02 2020
+++ src/usr.bin/make/parse.c	Sat Dec  5 19:03:45 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: parse.c,v 1.466 2020/12/05 18:38:02 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.467 2020/12/05 19:03:45 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -117,7 +117,7 @@
 #include "pathnames.h"
 
 /*	"@(#)parse.c	8.3 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: parse.c,v 1.466 2020/12/05 18:38:02 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.467 2020/12/05 19:03:45 rillig Exp $");
 
 /* types and constants */
 
@@ -855,12 +855,33 @@ ApplyDependencyOperator(GNodeType op)
 	break;
 }
 
+/*
+ * We add a .WAIT node in the dependency list. After any dynamic dependencies
+ * (and filename globbing) have happened, it is given a dependency on each
+ * previous child, back until the previous .WAIT node. The next child won't
+ * be scheduled until the .WAIT node is built.
+ *
+ * We give each .WAIT node a unique name (mainly for diagnostics).
+ */
+static void
+ParseDependencySourceWait(Boolean isSpecial)
+{
+	static int wait_number = 0;
+	char wait_src[16];
+	GNode *gn;
+
+	snprintf(wait_src, sizeof wait_src, ".WAIT_%u", ++wait_number);
+	gn = Targ_NewInternalNode(wait_src);
+	if (doing_depend)
+		ParseMark(gn);
+	gn->type = OP_WAIT | OP_PHONY | OP_DEPENDS | OP_NOTMAIN;
+	LinkToTargets(gn, isSpecial);
+
+}
+
 static Boolean
 ParseDependencySourceKeyword(const char *src, ParseSpecial specType)
 {
-static int wait_number = 0;
-char wait_src[16];
-GNode *gn;
 
 if (*src == '.' && ch_isupper(src[1])) {
 	int keywd = ParseFindKeyword(src);
@@ -871,22 +892,7 @@ ParseDependencySourceKeyword(const char 
 		return TRUE;
 	}
 	if (parseKeywords[keywd].spec == SP_WAIT) {
-		/*
-		 * We add a .WAIT node in the dependency list.
-		 * After any dynamic dependencies (and filename globbing)
-		 * have happened, it is given a dependency on each
-		 * previous child, back until the previous .WAIT node.
-		 * The next child won't be scheduled until the .WAIT node
-		 * is built.
-		 * We give each .WAIT node a unique name (mainly for
-		 * diagnostics).
-		 */
-		snprintf(wait_src, sizeof wait_src, ".WAIT_%u", ++wait_number);
-		gn = Targ_NewInternalNode(wait_src);
-		if (doing_depend)
-		ParseMark(gn);
-		gn->type = OP_WAIT | OP_PHONY | OP_DEPENDS | OP_NOTMAIN;
-		LinkToTargets(gn, specType != SP_NOT);
+		ParseDependencySourceWait(specType != SP_NOT);
 		return TRUE;
 	}
 	}

CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat Dec  5 19:03:46 UTC 2020

Modified Files:
src/usr.bin/make: parse.c

Log Message:
make(1): extract ParseDependencySourceWait


To generate a diff of this commit:
cvs rdiff -u -r1.466 -r1.467 src/usr.bin/make/parse.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/distrib/miniroot

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Dec  5 18:57:21 UTC 2020

Modified Files:
src/distrib/miniroot: install.sub

Log Message:
Inform the default installation directory in the official ftp server.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/distrib/miniroot/install.sub

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/miniroot/install.sub
diff -u src/distrib/miniroot/install.sub:1.57 src/distrib/miniroot/install.sub:1.58
--- src/distrib/miniroot/install.sub:1.57	Sat Dec  5 18:52:06 2020
+++ src/distrib/miniroot/install.sub	Sat Dec  5 18:57:21 2020
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$NetBSD: install.sub,v 1.57 2020/12/05 18:52:06 tsutsui Exp $
+#	$NetBSD: install.sub,v 1.58 2020/12/05 18:57:21 tsutsui Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -682,6 +682,10 @@ You will be asked to enter the name of t
 installation sets. When you enter a '?' you will see a listing of the
 current directory on the server.
 __install_ftp_2
+	echo ""
+	echo "The default installation directory in the official ftp server is:"
+	echo "/pub/NetBSD/NetBSD-${RELEASE}/${MACHINE}/binary/sets"
+
 	_sets=""
 	while [ -z "$_sets" ]
 	do

CVS commit: src/distrib/miniroot

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Dec  5 18:57:21 UTC 2020

Modified Files:
src/distrib/miniroot: install.sub

Log Message:
Inform the default installation directory in the official ftp server.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/distrib/miniroot/install.sub

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/distrib

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Dec  5 18:52:06 UTC 2020

Modified Files:
src/distrib/amiga/miniroot: install.md
src/distrib/hp300/miniroot: install.md
src/distrib/mac68k/miniroot: install.md
src/distrib/miniroot: install.sub list
src/distrib/mvme68k/miniroot: install.md
src/distrib/sun2/miniroot: install.md
src/distrib/sun3/miniroot: install.md

Log Message:
Use proper release version strings ("9.1" rather than "91") in banners.

Also define and use "MACHINE" variable to describe port names
(no uname(1) or sysctl(8) in miniroot binary list by default).

I guess the short format like "91" by ${DISTRIBREV} was used only
for split sets for floppies in 1990's releases.

Worth to pullup to netbsd-9.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/distrib/amiga/miniroot/install.md
cvs rdiff -u -r1.19 -r1.20 src/distrib/hp300/miniroot/install.md
cvs rdiff -u -r1.7 -r1.8 src/distrib/mac68k/miniroot/install.md
cvs rdiff -u -r1.56 -r1.57 src/distrib/miniroot/install.sub
cvs rdiff -u -r1.35 -r1.36 src/distrib/miniroot/list
cvs rdiff -u -r1.9 -r1.10 src/distrib/mvme68k/miniroot/install.md
cvs rdiff -u -r1.6 -r1.7 src/distrib/sun2/miniroot/install.md
cvs rdiff -u -r1.6 -r1.7 src/distrib/sun3/miniroot/install.md

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/amiga/miniroot/install.md
diff -u src/distrib/amiga/miniroot/install.md:1.30 src/distrib/amiga/miniroot/install.md:1.31
--- src/distrib/amiga/miniroot/install.md:1.30	Wed Apr 10 14:52:53 2019
+++ src/distrib/amiga/miniroot/install.md	Sat Dec  5 18:52:06 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: install.md,v 1.30 2019/04/10 14:52:53 christos Exp $
+#	$NetBSD: install.md,v 1.31 2020/12/05 18:52:06 tsutsui Exp $
 #
 #
 # Copyright (c) 1996,2006 The NetBSD Foundation, Inc.
@@ -140,7 +140,7 @@ md_labeldisk() {
 md_welcome_banner() {
 	if [ "$MODE" = "install" ]; then
 		echo ""
-		echo "Welcome to the NetBSD/amiga ${VERSION} installation program."
+		echo "Welcome to the NetBSD/${MACHINE} ${RELEASE} installation program."
 		cat << \__welcome_banner_1
 
 This program is designed to help you put NetBSD on your disk,
@@ -151,7 +151,7 @@ __welcome_banner_1
 
 	else
 		echo ""
-		echo "Welcome to the NetBSD/amiga ${VERSION} upgrade program."
+		echo "Welcome to the NetBSD/${MACHINE} ${RELEASE} upgrade program."
 		cat << \__welcome_banner_2
 
 This program is designed to help you upgrade your NetBSD system in a

Index: src/distrib/hp300/miniroot/install.md
diff -u src/distrib/hp300/miniroot/install.md:1.19 src/distrib/hp300/miniroot/install.md:1.20
--- src/distrib/hp300/miniroot/install.md:1.19	Sat Dec  5 18:27:39 2020
+++ src/distrib/hp300/miniroot/install.md	Sat Dec  5 18:52:06 2020
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$NetBSD: install.md,v 1.19 2020/12/05 18:27:39 tsutsui Exp $
+#	$NetBSD: install.md,v 1.20 2020/12/05 18:52:06 tsutsui Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -475,7 +475,7 @@ __md_copy_kernel_1
 md_welcome_banner() {
 (
 	echo	""
-	echo	"Welcome to the NetBSD/hp300 ${VERSION} installation program."
+	echo	"Welcome to the NetBSD/${MACHINE} ${RELEASE} installation program."
 	cat << \__welcome_banner_1
 
 This program is designed to help you install NetBSD on your system in a

Index: src/distrib/mac68k/miniroot/install.md
diff -u src/distrib/mac68k/miniroot/install.md:1.7 src/distrib/mac68k/miniroot/install.md:1.8
--- src/distrib/mac68k/miniroot/install.md:1.7	Sat Dec  5 18:27:39 2020
+++ src/distrib/mac68k/miniroot/install.md	Sat Dec  5 18:52:06 2020
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$NetBSD: install.md,v 1.7 2020/12/05 18:27:39 tsutsui Exp $
+#	$NetBSD: install.md,v 1.8 2020/12/05 18:52:06 tsutsui Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -127,7 +127,7 @@ md_copy_kernel() {
 md_welcome_banner() {
 (
 	echo	""
-	echo	"Welcome to the NetBSD/mac68k ${VERSION} installation program."
+	echo	"Welcome to the NetBSD/${MACHINE} ${RELEASE} installation program."
 	cat << \__welcome_banner_1
 
 This program is designed to help you install NetBSD on your system in a

Index: src/distrib/miniroot/install.sub
diff -u src/distrib/miniroot/install.sub:1.56 src/distrib/miniroot/install.sub:1.57
--- src/distrib/miniroot/install.sub:1.56	Sat Dec  5 18:33:47 2020
+++ src/distrib/miniroot/install.sub	Sat Dec  5 18:52:06 2020
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$NetBSD: install.sub,v 1.56 2020/12/05 18:33:47 tsutsui Exp $
+#	$NetBSD: install.sub,v 1.57 2020/12/05 18:52:06 tsutsui Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -32,8 +32,12 @@
 #	NetBSD installation/upgrade script - common subroutines.
 
 ROOTDISK=""# filled in below
-VERSION=89936
+MACHINE=# filled by distrib/miniroot/list
+export MACHINE
+VERSION=100# updated by distrib/miniroot/list
 

CVS commit: src/distrib

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Dec  5 18:52:06 UTC 2020

Modified Files:
src/distrib/amiga/miniroot: install.md
src/distrib/hp300/miniroot: install.md
src/distrib/mac68k/miniroot: install.md
src/distrib/miniroot: install.sub list
src/distrib/mvme68k/miniroot: install.md
src/distrib/sun2/miniroot: install.md
src/distrib/sun3/miniroot: install.md

Log Message:
Use proper release version strings ("9.1" rather than "91") in banners.

Also define and use "MACHINE" variable to describe port names
(no uname(1) or sysctl(8) in miniroot binary list by default).

I guess the short format like "91" by ${DISTRIBREV} was used only
for split sets for floppies in 1990's releases.

Worth to pullup to netbsd-9.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/distrib/amiga/miniroot/install.md
cvs rdiff -u -r1.19 -r1.20 src/distrib/hp300/miniroot/install.md
cvs rdiff -u -r1.7 -r1.8 src/distrib/mac68k/miniroot/install.md
cvs rdiff -u -r1.56 -r1.57 src/distrib/miniroot/install.sub
cvs rdiff -u -r1.35 -r1.36 src/distrib/miniroot/list
cvs rdiff -u -r1.9 -r1.10 src/distrib/mvme68k/miniroot/install.md
cvs rdiff -u -r1.6 -r1.7 src/distrib/sun2/miniroot/install.md
cvs rdiff -u -r1.6 -r1.7 src/distrib/sun3/miniroot/install.md

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

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat Dec  5 18:38:02 UTC 2020

Modified Files:
src/usr.bin/make: main.c make.h parse.c suff.c targ.c var.c

Log Message:
make(1): define constants for enum zero-values


To generate a diff of this commit:
cvs rdiff -u -r1.491 -r1.492 src/usr.bin/make/main.c
cvs rdiff -u -r1.230 -r1.231 src/usr.bin/make/make.h
cvs rdiff -u -r1.465 -r1.466 src/usr.bin/make/parse.c
cvs rdiff -u -r1.325 -r1.326 src/usr.bin/make/suff.c
cvs rdiff -u -r1.151 -r1.152 src/usr.bin/make/targ.c
cvs rdiff -u -r1.706 -r1.707 src/usr.bin/make/var.c

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/main.c
diff -u src/usr.bin/make/main.c:1.491 src/usr.bin/make/main.c:1.492
--- src/usr.bin/make/main.c:1.491	Tue Dec  1 19:28:32 2020
+++ src/usr.bin/make/main.c	Sat Dec  5 18:38:02 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.491 2020/12/01 19:28:32 rillig Exp $	*/
+/*	$NetBSD: main.c,v 1.492 2020/12/05 18:38:02 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -109,7 +109,7 @@
 #include "trace.h"
 
 /*	"@(#)main.c	8.3 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: main.c,v 1.491 2020/12/01 19:28:32 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.492 2020/12/05 18:38:02 rillig Exp $");
 #if defined(MAKE_NATIVE) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
 	"The Regents of the University of California.  "
@@ -1121,7 +1121,7 @@ static void
 CmdOpts_Init(void)
 {
 	opts.compatMake = FALSE;	/* No compat mode */
-	opts.debug = 0;			/* No debug verbosity, please. */
+	opts.debug = DEBUG_NONE;	/* No debug verbosity, please. */
 	/* opts.debug_file has been initialized earlier */
 	opts.lint = FALSE;
 	opts.debugVflag = FALSE;

Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.230 src/usr.bin/make/make.h:1.231
--- src/usr.bin/make/make.h:1.230	Sun Nov 29 09:27:40 2020
+++ src/usr.bin/make/make.h	Sat Dec  5 18:38:02 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: make.h,v 1.230 2020/11/29 09:27:40 rillig Exp $	*/
+/*	$NetBSD: make.h,v 1.231 2020/12/05 18:38:02 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -322,6 +322,7 @@ typedef enum GNodeType {
 } GNodeType;
 
 typedef enum GNodeFlags {
+	GNF_NONE	= 0,
 	/* this target needs to be (re)made */
 	REMAKE		= 0x0001,
 	/* children of this target were made */

Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.465 src/usr.bin/make/parse.c:1.466
--- src/usr.bin/make/parse.c:1.465	Sat Dec  5 18:15:40 2020
+++ src/usr.bin/make/parse.c	Sat Dec  5 18:38:02 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: parse.c,v 1.465 2020/12/05 18:15:40 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.466 2020/12/05 18:38:02 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -117,7 +117,7 @@
 #include "pathnames.h"
 
 /*	"@(#)parse.c	8.3 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: parse.c,v 1.465 2020/12/05 18:15:40 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.466 2020/12/05 18:38:02 rillig Exp $");
 
 /* types and constants */
 
@@ -299,50 +299,50 @@ static const struct {
 ParseSpecial  spec;		/* Type when used as a target */
 GNodeType	  op;		/* Operator when used as a source */
 } parseKeywords[] = {
-{ ".BEGIN",		SP_BEGIN,	0 },
-{ ".DEFAULT",	SP_DEFAULT,	0 },
-{ ".DELETE_ON_ERROR", SP_DELETE_ON_ERROR, 0 },
-{ ".END",		SP_END,		0 },
-{ ".ERROR",		SP_ERROR,	0 },
+{ ".BEGIN",		SP_BEGIN,	OP_NONE },
+{ ".DEFAULT",	SP_DEFAULT,	OP_NONE },
+{ ".DELETE_ON_ERROR", SP_DELETE_ON_ERROR, OP_NONE },
+{ ".END",		SP_END,		OP_NONE },
+{ ".ERROR",		SP_ERROR,	OP_NONE },
 { ".EXEC",		SP_ATTRIBUTE,	OP_EXEC },
 { ".IGNORE",	SP_IGNORE,	OP_IGNORE },
-{ ".INCLUDES",	SP_INCLUDES,	0 },
-{ ".INTERRUPT",	SP_INTERRUPT,	0 },
+{ ".INCLUDES",	SP_INCLUDES,	OP_NONE },
+{ ".INTERRUPT",	SP_INTERRUPT,	OP_NONE },
 { ".INVISIBLE",	SP_ATTRIBUTE,	OP_INVISIBLE },
 { ".JOIN",		SP_ATTRIBUTE,	OP_JOIN },
-{ ".LIBS",		SP_LIBS,	0 },
+{ ".LIBS",		SP_LIBS,	OP_NONE },
 { ".MADE",		SP_ATTRIBUTE,	OP_MADE },
-{ ".MAIN",		SP_MAIN,	0 },
+{ ".MAIN",		SP_MAIN,	OP_NONE },
 { ".MAKE",		SP_ATTRIBUTE,	OP_MAKE },
-{ ".MAKEFLAGS",	SP_MFLAGS,	0 },
+{ ".MAKEFLAGS",	SP_MFLAGS,	OP_NONE },
 { ".META",		SP_META,	OP_META },
-{ ".MFLAGS",	SP_MFLAGS,	0 },
+{ ".MFLAGS",	SP_MFLAGS,	OP_NONE },
 { ".NOMETA",	SP_NOMETA,	OP_NOMETA },
 { ".NOMETA_CMP",	SP_NOMETA_CMP,	OP_NOMETA_CMP },
 { ".NOPATH",	SP_NOPATH,	OP_NOPATH },
 { ".NOTMAIN",	SP_ATTRIBUTE,	OP_NOTMAIN },
-{ ".NOTPARALLEL",	SP_NOTPARALLEL,	0 },
-{ ".NO_PARALLEL",	SP_NOTPARALLEL,	0 },
-{ ".NULL",		SP_NULL,	0 },
-{ ".OBJDIR",	SP_OBJDIR,	0 },
+{ ".NOTPARALLEL",	SP_NOTPARALLEL,	OP_NONE },
+{ ".NO_PARALLEL",	SP_NOTPARALLEL,	OP_NONE },
+{ ".NULL",		SP_NULL,	OP_NONE },
+{ ".OBJDIR",	SP_OBJDIR,	OP_NONE },
 { ".OPTIONAL",	

CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat Dec  5 18:38:02 UTC 2020

Modified Files:
src/usr.bin/make: main.c make.h parse.c suff.c targ.c var.c

Log Message:
make(1): define constants for enum zero-values


To generate a diff of this commit:
cvs rdiff -u -r1.491 -r1.492 src/usr.bin/make/main.c
cvs rdiff -u -r1.230 -r1.231 src/usr.bin/make/make.h
cvs rdiff -u -r1.465 -r1.466 src/usr.bin/make/parse.c
cvs rdiff -u -r1.325 -r1.326 src/usr.bin/make/suff.c
cvs rdiff -u -r1.151 -r1.152 src/usr.bin/make/targ.c
cvs rdiff -u -r1.706 -r1.707 src/usr.bin/make/var.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/distrib/miniroot

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Dec  5 18:33:47 UTC 2020

Modified Files:
src/distrib/miniroot: install.sub

Log Message:
Explicitly sort set names fetched via ftp nlist.

Several binary sets are stored as symbolic links on releases and
it seems some ftpd doesn't sort nlist outputs by name in such case.

Worth to pullup to netbsd-9 and netbsd-8.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/distrib/miniroot/install.sub

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/distrib/miniroot

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Dec  5 18:33:47 UTC 2020

Modified Files:
src/distrib/miniroot: install.sub

Log Message:
Explicitly sort set names fetched via ftp nlist.

Several binary sets are stored as symbolic links on releases and
it seems some ftpd doesn't sort nlist outputs by name in such case.

Worth to pullup to netbsd-9 and netbsd-8.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/distrib/miniroot/install.sub

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/miniroot/install.sub
diff -u src/distrib/miniroot/install.sub:1.55 src/distrib/miniroot/install.sub:1.56
--- src/distrib/miniroot/install.sub:1.55	Sat Dec  5 18:29:50 2020
+++ src/distrib/miniroot/install.sub	Sat Dec  5 18:33:47 2020
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$NetBSD: install.sub,v 1.55 2020/12/05 18:29:50 tsutsui Exp $
+#	$NetBSD: install.sub,v 1.56 2020/12/05 18:33:47 tsutsui Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -713,7 +713,7 @@ __install_ftp_2
 		if [ $resp = '?' ]; then
 			sh /tmp/ftp-dir.sh
 		else
-			_sets=$(sh /tmp/ftp-dir.sh | sh /tmp/fname_filter.sh)
+			_sets=$(sh /tmp/ftp-dir.sh | sort -u | sh /tmp/fname_filter.sh)
 		fi
 	done
 	rm -f /tmp/ftp-dir.sh /tmp/fname_filter.sh

CVS commit: src/distrib/miniroot

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Dec  5 18:29:50 UTC 2020

Modified Files:
src/distrib/miniroot: install.sub

Log Message:
Appease awk warnings on suppressing dmesg timestamps.

> awk: warning: escape sequence `\[' treated as plain `['
>  source line number 1
>  context is
> { h=$0; >>>  gsub("^[ <<<
> awk: warning: escape sequence `\]' treated as plain `]'
>  source line number 1

Should be pulled up to netbsd-9.


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/distrib/miniroot/install.sub

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/miniroot/install.sub
diff -u src/distrib/miniroot/install.sub:1.54 src/distrib/miniroot/install.sub:1.55
--- src/distrib/miniroot/install.sub:1.54	Sat Dec  5 18:24:10 2020
+++ src/distrib/miniroot/install.sub	Sat Dec  5 18:29:50 2020
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$NetBSD: install.sub,v 1.54 2020/12/05 18:24:10 tsutsui Exp $
+#	$NetBSD: install.sub,v 1.55 2020/12/05 18:29:50 tsutsui Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1611,6 +1611,6 @@ mi_filter_msgbuf() {
 
 mi_filter_dmesg() {
 	# Remove timestemps, sort.
-	dmesg | awk '{ h=$0; gsub("^\[[0-9. ]*\] ", "", h); print h; }' \
+	dmesg | awk '{ h=$0; gsub("^[[0-9. ]*] ", "", h); print h; }' \
 	| sort -u
 }

CVS commit: src/distrib/miniroot

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Dec  5 18:29:50 UTC 2020

Modified Files:
src/distrib/miniroot: install.sub

Log Message:
Appease awk warnings on suppressing dmesg timestamps.

> awk: warning: escape sequence `\[' treated as plain `['
>  source line number 1
>  context is
> { h=$0; >>>  gsub("^[ <<<
> awk: warning: escape sequence `\]' treated as plain `]'
>  source line number 1

Should be pulled up to netbsd-9.


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/distrib/miniroot/install.sub

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/distrib

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Dec  5 18:27:39 UTC 2020

Modified Files:
src/distrib/hp300/miniroot: install.md
src/distrib/mac68k/miniroot: install.md

Log Message:
Add missing md_get_partition_range() that causes installation failure.

Also reported by Martin Trusler on testing hp300 miniroot.
Should be pulled up to netbsd-9 and netbsd-8.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/distrib/hp300/miniroot/install.md
cvs rdiff -u -r1.6 -r1.7 src/distrib/mac68k/miniroot/install.md

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/distrib

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Dec  5 18:27:39 UTC 2020

Modified Files:
src/distrib/hp300/miniroot: install.md
src/distrib/mac68k/miniroot: install.md

Log Message:
Add missing md_get_partition_range() that causes installation failure.

Also reported by Martin Trusler on testing hp300 miniroot.
Should be pulled up to netbsd-9 and netbsd-8.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/distrib/hp300/miniroot/install.md
cvs rdiff -u -r1.6 -r1.7 src/distrib/mac68k/miniroot/install.md

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/hp300/miniroot/install.md
diff -u src/distrib/hp300/miniroot/install.md:1.18 src/distrib/hp300/miniroot/install.md:1.19
--- src/distrib/hp300/miniroot/install.md:1.18	Sat Dec  5 18:16:11 2020
+++ src/distrib/hp300/miniroot/install.md	Sat Dec  5 18:27:39 2020
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$NetBSD: install.md,v 1.18 2020/12/05 18:16:11 tsutsui Exp $
+#	$NetBSD: install.md,v 1.19 2020/12/05 18:27:39 tsutsui Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -83,6 +83,11 @@ md_get_ifdevs() {
 	mi_filter_dmesg | awk -F : '/^le[0-9]*:/ { print $1; }' | sort -u
 }
 
+md_get_partition_range() {
+	# return an expression describing the valid partition id's
+	echo '[a-h]'
+}
+
 md_installboot() {
 	# $1 is the root disk
 

Index: src/distrib/mac68k/miniroot/install.md
diff -u src/distrib/mac68k/miniroot/install.md:1.6 src/distrib/mac68k/miniroot/install.md:1.7
--- src/distrib/mac68k/miniroot/install.md:1.6	Sat Dec  5 18:16:11 2020
+++ src/distrib/mac68k/miniroot/install.md	Sat Dec  5 18:27:39 2020
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$NetBSD: install.md,v 1.6 2020/12/05 18:16:11 tsutsui Exp $
+#	$NetBSD: install.md,v 1.7 2020/12/05 18:27:39 tsutsui Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -83,6 +83,11 @@ md_get_ifdevs() {
 	mi_filter_dmesg | awk -F : '/^sn[0-9]*:/ { print $1; }' | sort -u
 }
 
+md_get_partition_range() {
+	# return an expression describing the valid partition id's
+	echo '[a-h]'
+}
+
 md_installboot() {
 	# $1 is the root disk
 

CVS commit: src/distrib/miniroot

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Dec  5 18:24:10 UTC 2020

Modified Files:
src/distrib/miniroot: install.sub

Log Message:
Add modules set for default sets on miniroot installation.

Should be pulled up to netbsd-9 and netbsd-8.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/distrib/miniroot/install.sub

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/miniroot/install.sub
diff -u src/distrib/miniroot/install.sub:1.53 src/distrib/miniroot/install.sub:1.54
--- src/distrib/miniroot/install.sub:1.53	Sun Jan 19 00:57:00 2020
+++ src/distrib/miniroot/install.sub	Sat Dec  5 18:24:10 2020
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$NetBSD: install.sub,v 1.53 2020/01/19 00:57:00 kre Exp $
+#	$NetBSD: install.sub,v 1.54 2020/12/05 18:24:10 tsutsui Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -35,7 +35,7 @@ ROOTDISK=""# filled in below
 VERSION=89936
 export VERSION
 
-ALLSETS="base comp etc games man misc rescue text"	# default install sets
+ALLSETS="base comp etc games man misc modules rescue text"	# default install sets
 UPGRSETS="base comp games man misc text"		# default upgrade sets
 THESETS=		# one of the above
 

CVS commit: src/distrib/miniroot

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Dec  5 18:24:10 UTC 2020

Modified Files:
src/distrib/miniroot: install.sub

Log Message:
Add modules set for default sets on miniroot installation.

Should be pulled up to netbsd-9 and netbsd-8.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/distrib/miniroot/install.sub

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sat Dec  5 18:17:01 UTC 2020

Modified Files:
src/sys/kern: init_main.c kern_clock.c kern_exec.c kern_exit.c
kern_time.c
src/sys/sys: param.h proc.h timevar.h

Log Message:
Refactor interval timers to make it possible to support types other than
the BSD/POSIX per-process timers:

- "struct ptimer" is split into "struct itimer" (common interval timer
  data) and "struct ptimer" (per-process timer data, which contains a
  "struct itimer").

- Introduce a new "struct itimer_ops" that supplies information about
  the specific kind of interval timer, including it's processing
  queue, the softint handle used to schedule processing, the function
  to call when the timer fires (which adds it to the queue), and an
  optional function to call when the CLOCK_REALTIME clock is changed by
  a call to clock_settime() or settimeofday().

- Rename some fuctions to clearly identify what they're operating on
  (ptimer vs itimer).

- Use kmem(9) to allocate ptimer-related structures, rather than having
  dedicated pools for them.

Welcome to NetBSD 9.99.77.


To generate a diff of this commit:
cvs rdiff -u -r1.533 -r1.534 src/sys/kern/init_main.c
cvs rdiff -u -r1.142 -r1.143 src/sys/kern/kern_clock.c
cvs rdiff -u -r1.503 -r1.504 src/sys/kern/kern_exec.c
cvs rdiff -u -r1.290 -r1.291 src/sys/kern/kern_exit.c
cvs rdiff -u -r1.206 -r1.207 src/sys/kern/kern_time.c
cvs rdiff -u -r1.680 -r1.681 src/sys/sys/param.h
cvs rdiff -u -r1.367 -r1.368 src/sys/sys/proc.h
cvs rdiff -u -r1.44 -r1.45 src/sys/sys/timevar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/kern/init_main.c
diff -u src/sys/kern/init_main.c:1.533 src/sys/kern/init_main.c:1.534
--- src/sys/kern/init_main.c:1.533	Thu Nov 12 07:44:01 2020
+++ src/sys/kern/init_main.c	Sat Dec  5 18:17:01 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: init_main.c,v 1.533 2020/11/12 07:44:01 simonb Exp $	*/
+/*	$NetBSD: init_main.c,v 1.534 2020/12/05 18:17:01 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009, 2019 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.533 2020/11/12 07:44:01 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.534 2020/12/05 18:17:01 thorpej Exp $");
 
 #include "opt_cnmagic.h"
 #include "opt_ddb.h"
@@ -432,9 +432,6 @@ main(void)
 	/* Charge root for one process. */
 	(void)chgproccnt(0, 1);
 
-	/* Initialize timekeeping. */
-	time_init();
-
 	/* Initialize the run queues, turnstiles and sleep queues. */
 	sched_rqinit();
 	turnstile_init();
@@ -452,8 +449,8 @@ main(void)
 	error = mi_cpu_attach(curcpu());
 	KASSERT(error == 0);
 
-	/* Initialize timekeeping, part 2. */
-	time_init2();
+	/* Initialize timekeeping. */
+	time_init();
 
 	/*
 	 * Initialize mbuf's.  Do this now because we might attempt to

Index: src/sys/kern/kern_clock.c
diff -u src/sys/kern/kern_clock.c:1.142 src/sys/kern/kern_clock.c:1.143
--- src/sys/kern/kern_clock.c:1.142	Sun Oct 11 18:39:09 2020
+++ src/sys/kern/kern_clock.c	Sat Dec  5 18:17:01 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_clock.c,v 1.142 2020/10/11 18:39:09 thorpej Exp $	*/
+/*	$NetBSD: kern_clock.c,v 1.143 2020/12/05 18:17:01 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_clock.c,v 1.142 2020/10/11 18:39:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_clock.c,v 1.143 2020/12/05 18:17:01 thorpej Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_dtrace.h"
@@ -238,7 +238,7 @@ hardclock(struct clockframe *frame)
 	ci = curcpu();
 	l = ci->ci_onproc;
 
-	timer_tick(l, CLKF_USERMODE(frame));
+	ptimer_tick(l, CLKF_USERMODE(frame));
 
 	/*
 	 * If no separate statistics clock is available, run it from here.

Index: src/sys/kern/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.503 src/sys/kern/kern_exec.c:1.504
--- src/sys/kern/kern_exec.c:1.503	Wed Nov 25 21:08:59 2020
+++ src/sys/kern/kern_exec.c	Sat Dec  5 18:17:01 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_exec.c,v 1.503 2020/11/25 21:08:59 wiz Exp $	*/
+/*	$NetBSD: kern_exec.c,v 1.504 2020/12/05 18:17:01 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2019, 2020 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.503 2020/11/25 21:08:59 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.504 2020/12/05 18:17:01 thorpej Exp $");
 
 #include "opt_exec.h"
 #include "opt_execfmt.h"
@@ -1209,7 +1209,7 @@ execve_runproc(struct lwp *l, struct exe
 		lwp_ctl_exit();
 
 	/* Remove POSIX timers */
-	timers_free(p, TIMERS_POSIX);
+	ptimers_free(p, TIMERS_POSIX);
 
 	/* Set the PaX flags. */
 	pax_set_flags(epp, p);

Index: src/sys/kern/kern_exit.c
diff -u src/sys/kern/kern_exit.c:1.290 src/sys/kern/kern_exit.c:1.291
--- src/sys/kern/kern_exit.c:1.290	Sat May 23 23:42:43 2020

CVS commit: src/sys

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sat Dec  5 18:17:01 UTC 2020

Modified Files:
src/sys/kern: init_main.c kern_clock.c kern_exec.c kern_exit.c
kern_time.c
src/sys/sys: param.h proc.h timevar.h

Log Message:
Refactor interval timers to make it possible to support types other than
the BSD/POSIX per-process timers:

- "struct ptimer" is split into "struct itimer" (common interval timer
  data) and "struct ptimer" (per-process timer data, which contains a
  "struct itimer").

- Introduce a new "struct itimer_ops" that supplies information about
  the specific kind of interval timer, including it's processing
  queue, the softint handle used to schedule processing, the function
  to call when the timer fires (which adds it to the queue), and an
  optional function to call when the CLOCK_REALTIME clock is changed by
  a call to clock_settime() or settimeofday().

- Rename some fuctions to clearly identify what they're operating on
  (ptimer vs itimer).

- Use kmem(9) to allocate ptimer-related structures, rather than having
  dedicated pools for them.

Welcome to NetBSD 9.99.77.


To generate a diff of this commit:
cvs rdiff -u -r1.533 -r1.534 src/sys/kern/init_main.c
cvs rdiff -u -r1.142 -r1.143 src/sys/kern/kern_clock.c
cvs rdiff -u -r1.503 -r1.504 src/sys/kern/kern_exec.c
cvs rdiff -u -r1.290 -r1.291 src/sys/kern/kern_exit.c
cvs rdiff -u -r1.206 -r1.207 src/sys/kern/kern_time.c
cvs rdiff -u -r1.680 -r1.681 src/sys/sys/param.h
cvs rdiff -u -r1.367 -r1.368 src/sys/sys/proc.h
cvs rdiff -u -r1.44 -r1.45 src/sys/sys/timevar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/distrib

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Dec  5 18:16:11 UTC 2020

Modified Files:
src/distrib/hp300/miniroot: install.md
src/distrib/mac68k/miniroot: install.md
src/distrib/mvme68k/miniroot: install.md
src/distrib/sun2/miniroot: install.md
src/distrib/sun3/miniroot: install.md

Log Message:
The kernel and X sets should be specified in MD miniroot scripts.

Otherwise they are not listed at least on ftp installation.
The problem was reported by Martin Trusler on port-hp300@:
 https://mail-index.netbsd.org/port-hp300/2020/11/21/msg000174.html

Should be pulled up to netbsd-9 and netbsd-8.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/distrib/hp300/miniroot/install.md
cvs rdiff -u -r1.5 -r1.6 src/distrib/mac68k/miniroot/install.md
cvs rdiff -u -r1.8 -r1.9 src/distrib/mvme68k/miniroot/install.md
cvs rdiff -u -r1.5 -r1.6 src/distrib/sun2/miniroot/install.md
cvs rdiff -u -r1.5 -r1.6 src/distrib/sun3/miniroot/install.md

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/hp300/miniroot/install.md
diff -u src/distrib/hp300/miniroot/install.md:1.17 src/distrib/hp300/miniroot/install.md:1.18
--- src/distrib/hp300/miniroot/install.md:1.17	Wed Apr 10 14:52:53 2019
+++ src/distrib/hp300/miniroot/install.md	Sat Dec  5 18:16:11 2020
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$NetBSD: install.md,v 1.17 2019/04/10 14:52:53 christos Exp $
+#	$NetBSD: install.md,v 1.18 2020/12/05 18:16:11 tsutsui Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -35,7 +35,7 @@
 #
 
 # Machine-dependent install sets
-MDSETS=""
+MDSETS="kern-GENERIC xbase xcomp xetc xfont xserver"
 
 md_set_term() {
 	if [ ! -z "$TERM" ]; then

Index: src/distrib/mac68k/miniroot/install.md
diff -u src/distrib/mac68k/miniroot/install.md:1.5 src/distrib/mac68k/miniroot/install.md:1.6
--- src/distrib/mac68k/miniroot/install.md:1.5	Wed Apr 10 14:52:53 2019
+++ src/distrib/mac68k/miniroot/install.md	Sat Dec  5 18:16:11 2020
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$NetBSD: install.md,v 1.5 2019/04/10 14:52:53 christos Exp $
+#	$NetBSD: install.md,v 1.6 2020/12/05 18:16:11 tsutsui Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -35,7 +35,7 @@
 #
 
 # Machine-dependent install sets
-MDSETS=""
+MDSETS="kern-GENERIC xbase xcomp xetc xfont xserver"
 
 md_set_term() {
 	if [ ! -z "$TERM" ]; then

Index: src/distrib/mvme68k/miniroot/install.md
diff -u src/distrib/mvme68k/miniroot/install.md:1.8 src/distrib/mvme68k/miniroot/install.md:1.9
--- src/distrib/mvme68k/miniroot/install.md:1.8	Wed Apr 10 14:52:53 2019
+++ src/distrib/mvme68k/miniroot/install.md	Sat Dec  5 18:16:11 2020
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$NetBSD: install.md,v 1.8 2019/04/10 14:52:53 christos Exp $
+#	$NetBSD: install.md,v 1.9 2020/12/05 18:16:11 tsutsui Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -35,7 +35,7 @@
 #
 
 # Machine-dependent install sets
-MDSETS=""
+MDSETS="kern-GENERIC xbase xcomp xetc xfont xserver"
 
 md_set_term() {
 	if [ ! -z "$TERM" ]; then

Index: src/distrib/sun2/miniroot/install.md
diff -u src/distrib/sun2/miniroot/install.md:1.5 src/distrib/sun2/miniroot/install.md:1.6
--- src/distrib/sun2/miniroot/install.md:1.5	Wed Apr 10 14:52:53 2019
+++ src/distrib/sun2/miniroot/install.md	Sat Dec  5 18:16:11 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: install.md,v 1.5 2019/04/10 14:52:53 christos Exp $
+#	$NetBSD: install.md,v 1.6 2020/12/05 18:16:11 tsutsui Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 
 # Machine-dependent install sets
 # MDSETS="xbin xman xinc xcon" XXX
-MDSETS=""
+MDSETS="kern-GENERIC"
 
 md_set_term() {
 	if [ ! -z "$TERM" ]; then

Index: src/distrib/sun3/miniroot/install.md
diff -u src/distrib/sun3/miniroot/install.md:1.5 src/distrib/sun3/miniroot/install.md:1.6
--- src/distrib/sun3/miniroot/install.md:1.5	Wed Apr 10 14:52:53 2019
+++ src/distrib/sun3/miniroot/install.md	Sat Dec  5 18:16:11 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: install.md,v 1.5 2019/04/10 14:52:53 christos Exp $
+#	$NetBSD: install.md,v 1.6 2020/12/05 18:16:11 tsutsui Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 
 # Machine-dependent install sets
 # MDSETS="xbin xman xinc xcon" XXX
-MDSETS=""
+MDSETS="kern-GENERIC kern-GENERIC3X xbase xcomp xetc xfont xserver"
 
 md_set_term() {
 	if [ ! -z "$TERM" ]; then

CVS commit: src/distrib

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Dec  5 18:16:11 UTC 2020

Modified Files:
src/distrib/hp300/miniroot: install.md
src/distrib/mac68k/miniroot: install.md
src/distrib/mvme68k/miniroot: install.md
src/distrib/sun2/miniroot: install.md
src/distrib/sun3/miniroot: install.md

Log Message:
The kernel and X sets should be specified in MD miniroot scripts.

Otherwise they are not listed at least on ftp installation.
The problem was reported by Martin Trusler on port-hp300@:
 https://mail-index.netbsd.org/port-hp300/2020/11/21/msg000174.html

Should be pulled up to netbsd-9 and netbsd-8.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/distrib/hp300/miniroot/install.md
cvs rdiff -u -r1.5 -r1.6 src/distrib/mac68k/miniroot/install.md
cvs rdiff -u -r1.8 -r1.9 src/distrib/mvme68k/miniroot/install.md
cvs rdiff -u -r1.5 -r1.6 src/distrib/sun2/miniroot/install.md
cvs rdiff -u -r1.5 -r1.6 src/distrib/sun3/miniroot/install.md

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

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat Dec  5 18:15:40 UTC 2020

Modified Files:
src/usr.bin/make: arch.c cond.c job.c parse.c var.c

Log Message:
make(1): remove redundant assignments


To generate a diff of this commit:
cvs rdiff -u -r1.185 -r1.186 src/usr.bin/make/arch.c
cvs rdiff -u -r1.220 -r1.221 src/usr.bin/make/cond.c
cvs rdiff -u -r1.336 -r1.337 src/usr.bin/make/job.c
cvs rdiff -u -r1.464 -r1.465 src/usr.bin/make/parse.c
cvs rdiff -u -r1.705 -r1.706 src/usr.bin/make/var.c

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/arch.c
diff -u src/usr.bin/make/arch.c:1.185 src/usr.bin/make/arch.c:1.186
--- src/usr.bin/make/arch.c:1.185	Sat Dec  5 17:17:37 2020
+++ src/usr.bin/make/arch.c	Sat Dec  5 18:15:40 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: arch.c,v 1.185 2020/12/05 17:17:37 rillig Exp $	*/
+/*	$NetBSD: arch.c,v 1.186 2020/12/05 18:15:40 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -125,7 +125,7 @@
 #include "config.h"
 
 /*	"@(#)arch.c	8.2 (Berkeley) 1/2/94"	*/
-MAKE_RCSID("$NetBSD: arch.c,v 1.185 2020/12/05 17:17:37 rillig Exp $");
+MAKE_RCSID("$NetBSD: arch.c,v 1.186 2020/12/05 18:15:40 rillig Exp $");
 
 typedef struct List ArchList;
 typedef struct ListNode ArchListNode;
@@ -444,7 +444,6 @@ ArchStatMember(const char *archive, cons
 			size_t len = strlen(member);
 
 			if (len > AR_MAX_NAME_LEN) {
-len = AR_MAX_NAME_LEN;
 snprintf(copy, sizeof copy, "%s", member);
 hdr = HashTable_FindValue(>members, copy);
 			}

Index: src/usr.bin/make/cond.c
diff -u src/usr.bin/make/cond.c:1.220 src/usr.bin/make/cond.c:1.221
--- src/usr.bin/make/cond.c:1.220	Sun Nov 29 01:40:26 2020
+++ src/usr.bin/make/cond.c	Sat Dec  5 18:15:40 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: cond.c,v 1.220 2020/11/29 01:40:26 rillig Exp $	*/
+/*	$NetBSD: cond.c,v 1.221 2020/12/05 18:15:40 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -94,7 +94,7 @@
 #include "dir.h"
 
 /*	"@(#)cond.c	8.2 (Berkeley) 1/2/94"	*/
-MAKE_RCSID("$NetBSD: cond.c,v 1.220 2020/11/29 01:40:26 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.221 2020/12/05 18:15:40 rillig Exp $");
 
 /*
  * The parsing of conditional expressions is based on this grammar:
@@ -800,7 +800,7 @@ CondParser_LeafToken(CondParser *par, Bo
 	Token t;
 	char *arg = NULL;
 	size_t arglen;
-	const char *cp = par->p;
+	const char *cp;
 	const char *cp1;
 
 	if (CondParser_Func(par, doEval, ))

Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.336 src/usr.bin/make/job.c:1.337
--- src/usr.bin/make/job.c:1.336	Sat Dec  5 17:44:22 2020
+++ src/usr.bin/make/job.c	Sat Dec  5 18:15:40 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: job.c,v 1.336 2020/12/05 17:44:22 rillig Exp $	*/
+/*	$NetBSD: job.c,v 1.337 2020/12/05 18:15:40 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -143,7 +143,7 @@
 #include "trace.h"
 
 /*	"@(#)job.c	8.2 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: job.c,v 1.336 2020/12/05 17:44:22 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.337 2020/12/05 18:15:40 rillig Exp $");
 
 /* A shell defines how the commands are run.  All commands for a target are
  * written into a single file, which is then given to the shell to execute
@@ -1689,7 +1689,7 @@ JobOutput(char *cp, char *endp)
 static void
 JobDoOutput(Job *job, Boolean finish)
 {
-Boolean gotNL = FALSE;	/* true if got a newline */
+Boolean gotNL;		/* true if got a newline */
 Boolean fbuf;		/* true if our buffer filled up */
 size_t nr;			/* number of bytes read */
 size_t i;			/* auxiliary index into outBuf */

Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.464 src/usr.bin/make/parse.c:1.465
--- src/usr.bin/make/parse.c:1.464	Fri Dec  4 20:23:33 2020
+++ src/usr.bin/make/parse.c	Sat Dec  5 18:15:40 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: parse.c,v 1.464 2020/12/04 20:23:33 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.465 2020/12/05 18:15:40 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -117,7 +117,7 @@
 #include "pathnames.h"
 
 /*	"@(#)parse.c	8.3 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: parse.c,v 1.464 2020/12/04 20:23:33 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.465 2020/12/05 18:15:40 rillig Exp $");
 
 /* types and constants */
 
@@ -1422,7 +1422,7 @@ ParseDoDependencyTargets(char **inout_cp
 			 SearchPathList **inout_paths,
 			 StringList *curTargs)
 {
-char *cp = *inout_cp;
+char *cp;
 char *tgt = *inout_line;
 char savec;
 const char *p;
@@ -1876,7 +1876,7 @@ static void
 VarAssign_EvalSubst(const char *name, const char *uvalue, GNode *ctxt,
 		const char **out_avalue, void **out_avalue_freeIt)
 {
-const char *avalue = uvalue;
+const char *avalue;
 char *evalue;
 Boolean savedPreserveUndefined = preserveUndefined;
 

Index: 

CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat Dec  5 18:15:40 UTC 2020

Modified Files:
src/usr.bin/make: arch.c cond.c job.c parse.c var.c

Log Message:
make(1): remove redundant assignments


To generate a diff of this commit:
cvs rdiff -u -r1.185 -r1.186 src/usr.bin/make/arch.c
cvs rdiff -u -r1.220 -r1.221 src/usr.bin/make/cond.c
cvs rdiff -u -r1.336 -r1.337 src/usr.bin/make/job.c
cvs rdiff -u -r1.464 -r1.465 src/usr.bin/make/parse.c
cvs rdiff -u -r1.705 -r1.706 src/usr.bin/make/var.c

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/unit-tests

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat Dec  5 18:13:44 UTC 2020

Modified Files:
src/usr.bin/make/unit-tests: varmod-subst-regex.exp
varmod-subst-regex.mk

Log Message:
make(1): add test for unknown modifier in :C modifier replacement


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/varmod-subst-regex.exp
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/varmod-subst-regex.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/varmod-subst-regex.exp
diff -u src/usr.bin/make/unit-tests/varmod-subst-regex.exp:1.3 src/usr.bin/make/unit-tests/varmod-subst-regex.exp:1.4
--- src/usr.bin/make/unit-tests/varmod-subst-regex.exp:1.3	Fri Aug 28 17:15:04 2020
+++ src/usr.bin/make/unit-tests/varmod-subst-regex.exp	Sat Dec  5 18:13:44 2020
@@ -20,4 +20,6 @@ mod-regex-limits:22-ok:1 33 556
 mod-regex-limits:capture:ihgfedcbaabcdefghijABCDEFGHIJa0a1a2rest
 make: Regex compilation error: (details omitted)
 mod-regex-errors:
+make: Unknown modifier 'Z'
+mod-regex-errors: xy
 exit status 0

Index: src/usr.bin/make/unit-tests/varmod-subst-regex.mk
diff -u src/usr.bin/make/unit-tests/varmod-subst-regex.mk:1.5 src/usr.bin/make/unit-tests/varmod-subst-regex.mk:1.6
--- src/usr.bin/make/unit-tests/varmod-subst-regex.mk:1.5	Sat Oct 31 12:20:36 2020
+++ src/usr.bin/make/unit-tests/varmod-subst-regex.mk	Sat Dec  5 18:13:44 2020
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-subst-regex.mk,v 1.5 2020/10/31 12:20:36 rillig Exp $
+# $NetBSD: varmod-subst-regex.mk,v 1.6 2020/12/05 18:13:44 rillig Exp $
 #
 # Tests for the :C,from,to, variable modifier.
 
@@ -102,3 +102,8 @@ mod-regex-limits:
 
 mod-regex-errors:
 	@echo $@: ${UNDEF:Uvalue:C,[,,}
+
+	# If the replacement pattern produces a parse error because of an
+	# unknown modifier, the parse error is ignored in ParseModifierPart
+	# and the faulty variable expression expands to "".
+	@echo $@: ${word:L:C,.*,x${:U:Z}y,W}

CVS commit: src/usr.bin/make/unit-tests

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat Dec  5 18:13:44 UTC 2020

Modified Files:
src/usr.bin/make/unit-tests: varmod-subst-regex.exp
varmod-subst-regex.mk

Log Message:
make(1): add test for unknown modifier in :C modifier replacement


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/varmod-subst-regex.exp
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/varmod-subst-regex.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

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat Dec  5 17:46:42 UTC 2020

Modified Files:
src/usr.bin/make: meta.c

Log Message:
make(1): remove unused parameter from meta_needed


To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/usr.bin/make/meta.c

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/meta.c
diff -u src/usr.bin/make/meta.c:1.156 src/usr.bin/make/meta.c:1.157
--- src/usr.bin/make/meta.c:1.156	Sun Nov 29 21:31:55 2020
+++ src/usr.bin/make/meta.c	Sat Dec  5 17:46:41 2020
@@ -1,4 +1,4 @@
-/*  $NetBSD: meta.c,v 1.156 2020/11/29 21:31:55 rillig Exp $ */
+/*  $NetBSD: meta.c,v 1.157 2020/12/05 17:46:41 rillig Exp $ */
 
 /*
  * Implement 'meta' mode.
@@ -411,7 +411,7 @@ printCMDs(GNode *gn, FILE *fp)
  * Do we need/want a .meta file ?
  */
 static Boolean
-meta_needed(GNode *gn, const char *dname, const char *tname,
+meta_needed(GNode *gn, const char *dname,
 	char *objdir_realpath, Boolean verbose)
 {
 struct cached_stat cst;
@@ -485,7 +485,7 @@ meta_create(BuildMon *pbm, GNode *gn)
 tname = GNode_VarTarget(gn);
 
 /* if this succeeds objdir_realpath is realpath of dname */
-if (!meta_needed(gn, dname, tname, objdir_realpath, TRUE))
+if (!meta_needed(gn, dname, objdir_realpath, TRUE))
 	goto out;
 dname = objdir_realpath;
 
@@ -1101,7 +1101,7 @@ meta_oodate(GNode *gn, Boolean oodate)
 tname = GNode_VarTarget(gn);
 
 /* if this succeeds fname3 is realpath of dname */
-if (!meta_needed(gn, dname, tname, fname3, FALSE))
+if (!meta_needed(gn, dname, fname3, FALSE))
 	goto oodate_out;
 dname = fname3;
 

CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat Dec  5 17:46:42 UTC 2020

Modified Files:
src/usr.bin/make: meta.c

Log Message:
make(1): remove unused parameter from meta_needed


To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/usr.bin/make/meta.c

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

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat Dec  5 17:44:22 UTC 2020

Modified Files:
src/usr.bin/make: job.c

Log Message:
make(1): remove unused parameter from JobOutput


To generate a diff of this commit:
cvs rdiff -u -r1.335 -r1.336 src/usr.bin/make/job.c

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/job.c
diff -u src/usr.bin/make/job.c:1.335 src/usr.bin/make/job.c:1.336
--- src/usr.bin/make/job.c:1.335	Fri Dec  4 14:39:56 2020
+++ src/usr.bin/make/job.c	Sat Dec  5 17:44:22 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: job.c,v 1.335 2020/12/04 14:39:56 rillig Exp $	*/
+/*	$NetBSD: job.c,v 1.336 2020/12/05 17:44:22 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -143,7 +143,7 @@
 #include "trace.h"
 
 /*	"@(#)job.c	8.2 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: job.c,v 1.335 2020/12/04 14:39:56 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.336 2020/12/05 17:44:22 rillig Exp $");
 
 /* A shell defines how the commands are run.  All commands for a target are
  * written into a single file, which is then given to the shell to execute
@@ -1636,7 +1636,7 @@ JobStart(GNode *gn, JobFlags flags)
 /* Print the output of the shell command, skipping the noPrint command of
  * the shell, if any. */
 static char *
-JobOutput(Job *job, char *cp, char *endp)
+JobOutput(char *cp, char *endp)
 {
 char *ecp;
 
@@ -1774,7 +1774,7 @@ again:
 	if (i >= job->curPos) {
 	char *cp;
 
-	cp = JobOutput(job, job->outBuf, >outBuf[i]);
+	cp = JobOutput(job->outBuf, >outBuf[i]);
 
 	/*
 	 * There's still more in that thar buffer. This time, though,

CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat Dec  5 17:44:22 UTC 2020

Modified Files:
src/usr.bin/make: job.c

Log Message:
make(1): remove unused parameter from JobOutput


To generate a diff of this commit:
cvs rdiff -u -r1.335 -r1.336 src/usr.bin/make/job.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/kern

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sat Dec  5 17:42:29 UTC 2020

Modified Files:
src/sys/kern: subr_tftproot.c

Log Message:
Remove unnecessary inclusion of 


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/kern/subr_tftproot.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/kern/subr_tftproot.c
diff -u src/sys/kern/subr_tftproot.c:1.24 src/sys/kern/subr_tftproot.c:1.25
--- src/sys/kern/subr_tftproot.c:1.24	Sat Mar  7 23:20:19 2020
+++ src/sys/kern/subr_tftproot.c	Sat Dec  5 17:42:29 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_tftproot.c,v 1.24 2020/03/07 23:20:19 tnn Exp $ */
+/*	$NetBSD: subr_tftproot.c,v 1.25 2020/12/05 17:42:29 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2007 Emmanuel Dreyfus, all rights reserved.
@@ -39,7 +39,7 @@
 #include "opt_md.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: subr_tftproot.c,v 1.24 2020/03/07 23:20:19 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_tftproot.c,v 1.25 2020/12/05 17:42:29 thorpej Exp $");
 
 #include 
 #include 
@@ -48,7 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: subr_tftproo
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 

CVS commit: src/sys/kern

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sat Dec  5 17:42:29 UTC 2020

Modified Files:
src/sys/kern: subr_tftproot.c

Log Message:
Remove unnecessary inclusion of 


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/kern/subr_tftproot.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sat Dec  5 17:40:00 UTC 2020

Modified Files:
src/sys/secmodel/keylock: secmodel_keylock.c
src/sys/ufs/lfs: ulfs_quota2.c

Log Message:
Remove unnecessary inclusion of .


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/secmodel/keylock/secmodel_keylock.c
cvs rdiff -u -r1.32 -r1.33 src/sys/ufs/lfs/ulfs_quota2.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/secmodel/keylock/secmodel_keylock.c
diff -u src/sys/secmodel/keylock/secmodel_keylock.c:1.10 src/sys/secmodel/keylock/secmodel_keylock.c:1.11
--- src/sys/secmodel/keylock/secmodel_keylock.c:1.10	Fri Feb 21 00:26:23 2020
+++ src/sys/secmodel/keylock/secmodel_keylock.c	Sat Dec  5 17:40:00 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_keylock.c,v 1.10 2020/02/21 00:26:23 joerg Exp $ */
+/* $NetBSD: secmodel_keylock.c,v 1.11 2020/12/05 17:40:00 thorpej Exp $ */
 /*-
  * Copyright (c) 2009 Marc Balmer 
  * Copyright (c) 2006 Elad Efrat 
@@ -54,7 +54,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: secmodel_keylock.c,v 1.10 2020/02/21 00:26:23 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_keylock.c,v 1.11 2020/12/05 17:40:00 thorpej Exp $");
 
 #include 
 #include 
@@ -64,7 +64,6 @@ __KERNEL_RCSID(0, "$NetBSD: secmodel_key
 #include 
 #include 
 #include 
-#include 
 
 #include 
 

Index: src/sys/ufs/lfs/ulfs_quota2.c
diff -u src/sys/ufs/lfs/ulfs_quota2.c:1.32 src/sys/ufs/lfs/ulfs_quota2.c:1.33
--- src/sys/ufs/lfs/ulfs_quota2.c:1.32	Fri Jan 17 20:08:10 2020
+++ src/sys/ufs/lfs/ulfs_quota2.c	Sat Dec  5 17:40:00 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: ulfs_quota2.c,v 1.32 2020/01/17 20:08:10 ad Exp $	*/
+/*	$NetBSD: ulfs_quota2.c,v 1.33 2020/12/05 17:40:00 thorpej Exp $	*/
 /*  from NetBSD: ufs_quota2.c,v 1.40 2015/03/28 19:24:05 maxv Exp Exp  */
 /*  from NetBSD: ffs_quota2.c,v 1.5 2015/02/22 14:12:48 maxv Exp  */
 
@@ -29,7 +29,7 @@
   */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ulfs_quota2.c,v 1.32 2020/01/17 20:08:10 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_quota2.c,v 1.33 2020/12/05 17:40:00 thorpej Exp $");
 
 #include 
 #include 
@@ -43,7 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_quota2.
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 

CVS commit: src/sys

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sat Dec  5 17:40:00 UTC 2020

Modified Files:
src/sys/secmodel/keylock: secmodel_keylock.c
src/sys/ufs/lfs: ulfs_quota2.c

Log Message:
Remove unnecessary inclusion of .


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/secmodel/keylock/secmodel_keylock.c
cvs rdiff -u -r1.32 -r1.33 src/sys/ufs/lfs/ulfs_quota2.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sat Dec  5 17:33:54 UTC 2020

Modified Files:
src/sys/dev/ic: isp_netbsd.c
src/sys/secmodel/securelevel: secmodel_securelevel.c
src/sys/ufs/ufs: ufs_quota2.c

Log Message:
Remove unnecessary inclusion of .


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/sys/dev/ic/isp_netbsd.c
cvs rdiff -u -r1.36 -r1.37 \
src/sys/secmodel/securelevel/secmodel_securelevel.c
cvs rdiff -u -r1.42 -r1.43 src/sys/ufs/ufs/ufs_quota2.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/ic/isp_netbsd.c
diff -u src/sys/dev/ic/isp_netbsd.c:1.95 src/sys/dev/ic/isp_netbsd.c:1.96
--- src/sys/dev/ic/isp_netbsd.c:1.95	Wed Sep 25 15:51:37 2019
+++ src/sys/dev/ic/isp_netbsd.c	Sat Dec  5 17:33:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_netbsd.c,v 1.95 2019/09/25 15:51:37 maya Exp $ */
+/* $NetBSD: isp_netbsd.c,v 1.96 2020/12/05 17:33:53 thorpej Exp $ */
 /*
  * Platform (NetBSD) dependent common attachment code for Qlogic adapters.
  */
@@ -33,14 +33,12 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: isp_netbsd.c,v 1.95 2019/09/25 15:51:37 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp_netbsd.c,v 1.96 2020/12/05 17:33:53 thorpej Exp $");
 
 #include 
 #include 
 #include 
 
-#include 
-
 /*
  * Set a timeout for the watchdogging of a command.
  *

Index: src/sys/secmodel/securelevel/secmodel_securelevel.c
diff -u src/sys/secmodel/securelevel/secmodel_securelevel.c:1.36 src/sys/secmodel/securelevel/secmodel_securelevel.c:1.37
--- src/sys/secmodel/securelevel/secmodel_securelevel.c:1.36	Thu May 28 23:17:25 2020
+++ src/sys/secmodel/securelevel/secmodel_securelevel.c	Sat Dec  5 17:33:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_securelevel.c,v 1.36 2020/05/28 23:17:25 riastradh Exp $ */
+/* $NetBSD: secmodel_securelevel.c,v 1.37 2020/12/05 17:33:53 thorpej Exp $ */
 /*-
  * Copyright (c) 2006 Elad Efrat 
  * All rights reserved.
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: secmodel_securelevel.c,v 1.36 2020/05/28 23:17:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_securelevel.c,v 1.37 2020/12/05 17:33:53 thorpej Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_insecure.h"
@@ -50,7 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: secmodel_sec
 #include 
 #include 
 #include 
-#include 
 
 #include 
 

Index: src/sys/ufs/ufs/ufs_quota2.c
diff -u src/sys/ufs/ufs/ufs_quota2.c:1.42 src/sys/ufs/ufs/ufs_quota2.c:1.43
--- src/sys/ufs/ufs/ufs_quota2.c:1.42	Wed Mar  1 10:42:45 2017
+++ src/sys/ufs/ufs/ufs_quota2.c	Sat Dec  5 17:33:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_quota2.c,v 1.42 2017/03/01 10:42:45 hannken Exp $ */
+/* $NetBSD: ufs_quota2.c,v 1.43 2020/12/05 17:33:54 thorpej Exp $ */
 /*-
   * Copyright (c) 2010 Manuel Bouyer
   * All rights reserved.
@@ -26,7 +26,7 @@
   */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c,v 1.42 2017/03/01 10:42:45 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c,v 1.43 2020/12/05 17:33:54 thorpej Exp $");
 
 #include 
 #include 
@@ -41,7 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 

CVS commit: src/sys

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sat Dec  5 17:33:54 UTC 2020

Modified Files:
src/sys/dev/ic: isp_netbsd.c
src/sys/secmodel/securelevel: secmodel_securelevel.c
src/sys/ufs/ufs: ufs_quota2.c

Log Message:
Remove unnecessary inclusion of .


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/sys/dev/ic/isp_netbsd.c
cvs rdiff -u -r1.36 -r1.37 \
src/sys/secmodel/securelevel/secmodel_securelevel.c
cvs rdiff -u -r1.42 -r1.43 src/sys/ufs/ufs/ufs_quota2.c

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

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat Dec  5 17:25:42 UTC 2020

Modified Files:
src/usr.bin/make: util.c

Log Message:
make(1): refuse to use vsnprintf that is prone to buffer overflows

Several parts of make intentionally depend on the guarantee that
snprintf and vsnprintf do not overflow their buffer.  If an
implementation cannot provide this guarantee, refuse to use it.


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/usr.bin/make/util.c

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/util.c
diff -u src/usr.bin/make/util.c:1.70 src/usr.bin/make/util.c:1.71
--- src/usr.bin/make/util.c:1.70	Mon Nov 23 23:41:11 2020
+++ src/usr.bin/make/util.c	Sat Dec  5 17:25:41 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: util.c,v 1.70 2020/11/23 23:41:11 rillig Exp $	*/
+/*	$NetBSD: util.c,v 1.71 2020/12/05 17:25:41 rillig Exp $	*/
 
 /*
  * Missing stuff from OS's
@@ -15,7 +15,7 @@
 
 #include "make.h"
 
-MAKE_RCSID("$NetBSD: util.c,v 1.70 2020/11/23 23:41:11 rillig Exp $");
+MAKE_RCSID("$NetBSD: util.c,v 1.71 2020/12/05 17:25:41 rillig Exp $");
 
 #if !defined(MAKE_NATIVE) && !defined(HAVE_STRERROR)
 extern int errno, sys_nerr;
@@ -378,8 +378,7 @@ vsnprintf(char *s, size_t n, const char 
 	fakebuf._cnt = 0;
 	return n - fakebuf._cnt - 1;
 #else
-	(void)vsprintf(s, fmt, args);
-	return strlen(s);
+	::: "error: vsnprintf must be available";
 #endif
 }
 

CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat Dec  5 17:25:42 UTC 2020

Modified Files:
src/usr.bin/make: util.c

Log Message:
make(1): refuse to use vsnprintf that is prone to buffer overflows

Several parts of make intentionally depend on the guarantee that
snprintf and vsnprintf do not overflow their buffer.  If an
implementation cannot provide this guarantee, refuse to use it.


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/usr.bin/make/util.c

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

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat Dec  5 17:17:38 UTC 2020

Modified Files:
src/usr.bin/make: arch.c

Log Message:
make(1): remove unused variable from ArchFindMember


To generate a diff of this commit:
cvs rdiff -u -r1.184 -r1.185 src/usr.bin/make/arch.c

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/arch.c
diff -u src/usr.bin/make/arch.c:1.184 src/usr.bin/make/arch.c:1.185
--- src/usr.bin/make/arch.c:1.184	Fri Dec  4 14:51:46 2020
+++ src/usr.bin/make/arch.c	Sat Dec  5 17:17:37 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: arch.c,v 1.184 2020/12/04 14:51:46 rillig Exp $	*/
+/*	$NetBSD: arch.c,v 1.185 2020/12/05 17:17:37 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -125,7 +125,7 @@
 #include "config.h"
 
 /*	"@(#)arch.c	8.2 (Berkeley) 1/2/94"	*/
-MAKE_RCSID("$NetBSD: arch.c,v 1.184 2020/12/04 14:51:46 rillig Exp $");
+MAKE_RCSID("$NetBSD: arch.c,v 1.185 2020/12/05 17:17:37 rillig Exp $");
 
 typedef struct List ArchList;
 typedef struct ListNode ArchListNode;
@@ -723,7 +723,7 @@ ArchFindMember(const char *archive, cons
 	FILE *arch;		/* Stream to archive */
 	int size;		/* Size of archive member */
 	char magic[SARMAG];
-	size_t len, tlen;
+	size_t len;
 	const char *lastSlash;
 
 	arch = fopen(archive, mode);
@@ -748,10 +748,7 @@ ArchFindMember(const char *archive, cons
 	if (lastSlash != NULL)
 		member = lastSlash + 1;
 
-	len = tlen = strlen(member);
-	if (len > sizeof out_arh->ar_name) {
-		tlen = sizeof out_arh->ar_name;
-	}
+	len = strlen(member);
 
 	while (fread(out_arh, sizeof *out_arh, 1, arch) == 1) {
 

CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat Dec  5 17:17:38 UTC 2020

Modified Files:
src/usr.bin/make: arch.c

Log Message:
make(1): remove unused variable from ArchFindMember


To generate a diff of this commit:
cvs rdiff -u -r1.184 -r1.185 src/usr.bin/make/arch.c

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

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat Dec  5 17:12:02 UTC 2020

Modified Files:
src/usr.bin/make: suff.c

Log Message:
make(1): extract ExpandChildrenRegular from ExpandChildren


To generate a diff of this commit:
cvs rdiff -u -r1.324 -r1.325 src/usr.bin/make/suff.c

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/suff.c
diff -u src/usr.bin/make/suff.c:1.324 src/usr.bin/make/suff.c:1.325
--- src/usr.bin/make/suff.c:1.324	Sat Dec  5 16:59:47 2020
+++ src/usr.bin/make/suff.c	Sat Dec  5 17:12:02 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: suff.c,v 1.324 2020/12/05 16:59:47 rillig Exp $	*/
+/*	$NetBSD: suff.c,v 1.325 2020/12/05 17:12:02 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -114,7 +114,7 @@
 #include "dir.h"
 
 /*	"@(#)suff.c	8.4 (Berkeley) 3/21/94"	*/
-MAKE_RCSID("$NetBSD: suff.c,v 1.324 2020/12/05 16:59:47 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.325 2020/12/05 17:12:02 rillig Exp $");
 
 #define SUFF_DEBUG0(text) DEBUG0(SUFF, text)
 #define SUFF_DEBUG1(fmt, arg1) DEBUG1(SUFF, fmt, arg1)
@@ -1278,6 +1278,74 @@ ExpandWildcards(GNodeListNode *cln, GNod
 }
 
 /*
+ * Break the result into a vector of strings whose nodes we can find, then
+ * add those nodes to the members list.
+ *
+ * Unfortunately, we can't use Str_Words because it doesn't understand about
+ * variable specifications with spaces in them.
+ */
+static void
+ExpandChildrenRegular(char *cp, GNode *pgn, GNodeList *members)
+{
+	char *start;
+
+	pp_skip_hspace();
+	start = cp;
+	while (*cp != '\0') {
+		if (*cp == ' ' || *cp == '\t') {
+			GNode *gn;
+			/*
+			 * White-space -- terminate element, find the node,
+			 * add it, skip any further spaces.
+			 */
+			*cp++ = '\0';
+			gn = Targ_GetNode(start);
+			Lst_Append(members, gn);
+			pp_skip_hspace();
+			/* Continue at the next non-space. */
+			start = cp;
+		} else if (*cp == '$') {
+			/* Skip over the variable expression. */
+			const char *nested_p = cp;
+			const char *junk;
+			void *freeIt;
+
+			(void)Var_Parse(_p, pgn,
+			VARE_NONE, , );
+			/* TODO: handle errors */
+			if (junk == var_Error) {
+Parse_Error(PARSE_FATAL,
+"Malformed variable expression at \"%s\"",
+cp);
+cp++;
+			} else {
+cp += nested_p - cp;
+			}
+
+			free(freeIt);
+		} else if (cp[0] == '\\' && cp[1] != '\0') {
+			/* Escaped something -- skip over it. */
+			/*
+			 * XXX: In other places, escaping at this syntactical
+			 * position is done by a '$', not a '\'.  The '\' is
+			 * only used in variable modifiers.
+			 */
+			cp += 2;
+		} else {
+			cp++;
+		}
+	}
+
+	if (cp != start) {
+		/*
+		 * Stuff left over -- add it to the list too
+		 */
+		GNode *gn = Targ_GetNode(start);
+		Lst_Append(members, gn);
+	}
+}
+
+/*
  * Expand the names of any children of a given node that contain variable
  * expressions or file wildcards into actual targets.
  *
@@ -1326,87 +1394,10 @@ ExpandChildren(GNodeListNode *cln, GNode
 			 * call on the Arch module to find the nodes for us,
 			 * expanding variables in the parent's context.
 			 */
-			char *sacrifice = cp;
-
-			(void)Arch_ParseArchive(, , pgn);
+			char *p = cp;
+			(void)Arch_ParseArchive(, , pgn);
 		} else {
-			/*
-			 * Break the result into a vector of strings whose
-			 * nodes we can find, then add those nodes to the
-			 * members list.
-			 *
-			 * Unfortunately, we can't use Str_Words because it
-			 * doesn't understand about variable specifications
-			 * with spaces in them.
-			 */
-			char *start;
-			char *initcp = cp;	/* For freeing... */
-
-			start = cp;
-			pp_skip_hspace();
-			cp = start;
-			while (*cp != '\0') {
-if (*cp == ' ' || *cp == '\t') {
-	GNode *gn;
-	/*
-	 * White-space -- terminate element,
-	 * find the node, add it, skip any
-	 * further spaces.
-	 */
-	*cp++ = '\0';
-	gn = Targ_GetNode(start);
-	Lst_Append(, gn);
-	pp_skip_hspace();
-	/* Continue at the next non-space. */
-	start = cp;
-} else if (*cp == '$') {
-	/* Skip over the variable expression. */
-	const char *nested_p = cp;
-	const char *junk;
-	void *freeIt;
-
-	(void)Var_Parse(_p, pgn,
-	VARE_NONE, , );
-	/* TODO: handle errors */
-	if (junk == var_Error) {
-		Parse_Error(PARSE_FATAL,
-		"Malformed variable "
-		"expression at \"%s\"",
-		cp);
-		cp++;
-	} else {
-		cp += nested_p - cp;
-	}
-
-	free(freeIt);
-} else if (cp[0] == '\\' && cp[1] != '\0') {
-	/*
-	 * Escaped something -- skip over it
-	 */
-	/*
-	 * XXX: In other places, escaping at
-	 * this syntactical position is done
-	 * by a '$', not a '\'.  The '\' is
-	 * only used in variable modifiers.
-	 */
-	cp += 2;
-} else {
-	cp++;
-}
-			}
-
-			if (cp != start) {
-/*
- * Stuff left over -- add it to 

CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat Dec  5 17:12:02 UTC 2020

Modified Files:
src/usr.bin/make: suff.c

Log Message:
make(1): extract ExpandChildrenRegular from ExpandChildren


To generate a diff of this commit:
cvs rdiff -u -r1.324 -r1.325 src/usr.bin/make/suff.c

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

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat Dec  5 16:59:47 UTC 2020

Modified Files:
src/usr.bin/make: suff.c

Log Message:
make(1): indent suff.c with tabs instead of spaces

ExpandChildren is way too deeply nested.


To generate a diff of this commit:
cvs rdiff -u -r1.323 -r1.324 src/usr.bin/make/suff.c

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/suff.c
diff -u src/usr.bin/make/suff.c:1.323 src/usr.bin/make/suff.c:1.324
--- src/usr.bin/make/suff.c:1.323	Sun Nov 29 01:40:26 2020
+++ src/usr.bin/make/suff.c	Sat Dec  5 16:59:47 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: suff.c,v 1.323 2020/11/29 01:40:26 rillig Exp $	*/
+/*	$NetBSD: suff.c,v 1.324 2020/12/05 16:59:47 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -114,7 +114,7 @@
 #include "dir.h"
 
 /*	"@(#)suff.c	8.4 (Berkeley) 3/21/94"	*/
-MAKE_RCSID("$NetBSD: suff.c,v 1.323 2020/11/29 01:40:26 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.324 2020/12/05 16:59:47 rillig Exp $");
 
 #define SUFF_DEBUG0(text) DEBUG0(SUFF, text)
 #define SUFF_DEBUG1(fmt, arg1) DEBUG1(SUFF, fmt, arg1)
@@ -126,25 +126,54 @@ typedef ListNode SuffixListNode;
 typedef List CandidateList;
 typedef ListNode CandidateListNode;
 
-static SuffixList sufflist = LST_INIT;	/* List of suffixes */
+/* The defined suffixes, such as '.c', '.o', '.l'. */
+static SuffixList sufflist = LST_INIT;
 #ifdef CLEANUP
-static SuffixList suffClean = LST_INIT;	/* List of suffixes to be cleaned */
+/* The suffixes to be cleaned up at the end. */
+static SuffixList suffClean = LST_INIT;
 #endif
 
-/* List of transformation rules, such as ".c.o" */
+/*
+ * The transformation rules, such as '.c.o' to transform '.c' into '.o',
+ * or simply '.c' to transform 'file.c' into 'file'.
+ */
 static GNodeList transforms = LST_INIT;
 
-static int sNum = 0;		/* Counter for assigning suffix numbers */
+/*
+ * Counter for assigning suffix numbers.
+ * TODO: What are these suffix numbers used for?
+ */
+static int sNum = 0;
 
 typedef enum SuffixFlags {
-SUFF_INCLUDE	= 0x01,	/* One which is #include'd */
-SUFF_LIBRARY	= 0x02,	/* One which contains a library */
-SUFF_NULL		= 0x04	/* The empty suffix */
-/* XXX: Why is SUFF_NULL needed? Wouldn't nameLen == 0 mean the same? */
+
+	/*
+	 * This suffix marks include files.  Their search path ends up in the
+	 * undocumented special variable '.INCLUDES'.
+	 */
+	SUFF_INCLUDE	= 1 << 0,
+
+	/*
+	 * This suffix marks library files.  Their search path ends up in the
+	 * undocumented special variable '.LIBS'.
+	 */
+	SUFF_LIBRARY	= 1 << 1,
+
+	/*
+	 * The empty suffix.
+	 *
+	 * XXX: What is the difference between the empty suffix and the null
+	 * suffix?
+	 *
+	 * XXX: Why is SUFF_NULL needed at all? Wouldn't nameLen == 0 mean
+	 * the same?
+	 */
+	SUFF_NULL	= 1 << 2
+
 } SuffixFlags;
 
 ENUM_FLAGS_RTTI_3(SuffixFlags,
-		  SUFF_INCLUDE, SUFF_LIBRARY, SUFF_NULL);
+SUFF_INCLUDE, SUFF_LIBRARY, SUFF_NULL);
 
 typedef List SuffixListList;
 
@@ -153,28 +182,29 @@ typedef List SuffixListList;
  * such as ".c.o:".
  */
 typedef struct Suffix {
-/* The suffix itself, such as ".c" */
-char *name;
-/* Length of the name, to avoid strlen calls */
-size_t nameLen;
-/* Type of suffix */
-SuffixFlags flags;
-/* The path along which files of this suffix may be found */
-SearchPath *searchPath;
-/* The suffix number; TODO: document the purpose of this number */
-int sNum;
-/* Reference count of list membership and several other places */
-int refCount;
-/* Suffixes we have a transformation to */
-SuffixList parents;
-/* Suffixes we have a transformation from */
-SuffixList children;
-
-/* Lists in which this suffix is referenced.
- * XXX: These lists are used nowhere, they are just appended to, for no
- * apparent reason.  They do have the side effect of increasing refCount
- * though. */
-SuffixListList ref;
+	/* The suffix itself, such as ".c" */
+	char *name;
+	/* Length of the name, to avoid strlen calls */
+	size_t nameLen;
+	/* Type of suffix */
+	SuffixFlags flags;
+	/* The path along which files of this suffix may be found */
+	SearchPath *searchPath;
+	/* The suffix number; TODO: document the purpose of this number */
+	int sNum;
+	/* Reference count of list membership and several other places */
+	int refCount;
+	/* Suffixes we have a transformation to */
+	SuffixList parents;
+	/* Suffixes we have a transformation from */
+	SuffixList children;
+
+	/* Lists in which this suffix is referenced.
+	 *
+	 * XXX: These lists are used nowhere, they are just appended to, for
+	 * no apparent reason.  They do have the side effect of increasing
+	 * refCount though. */
+	SuffixListList ref;
 } Suffix;
 
 /*
@@ -187,36 +217,36 @@ typedef struct Suffix {
  * node is finally chosen to be made.
  */
 typedef struct Candidate {
-/* The file 

CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat Dec  5 16:59:47 UTC 2020

Modified Files:
src/usr.bin/make: suff.c

Log Message:
make(1): indent suff.c with tabs instead of spaces

ExpandChildren is way too deeply nested.


To generate a diff of this commit:
cvs rdiff -u -r1.323 -r1.324 src/usr.bin/make/suff.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/doc

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Sat Dec  5 16:23:08 UTC 2020

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
pkg_install updated to 20201205


To generate a diff of this commit:
cvs rdiff -u -r1.1766 -r1.1767 src/doc/3RDPARTY
cvs rdiff -u -r1.2762 -r1.2763 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1766 src/doc/3RDPARTY:1.1767
--- src/doc/3RDPARTY:1.1766	Fri Dec  4 18:44:49 2020
+++ src/doc/3RDPARTY	Sat Dec  5 16:23:08 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1766 2020/12/04 18:44:49 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1767 2020/12/05 16:23:08 wiz Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1192,11 +1192,11 @@ definition (files.pf).  userland code is
 reachover Makefiles are in src/usr.sbin/pf.
 
 Package:	pkg_install
-Version:	20190405
-Current Vers:	20201202
+Version:	20201205
+Current Vers:	20201205
 Maintainer:	The pkgsrc developers
 Home Page:	http://www.pkgsrc.org/
-Date:		2020-12-02
+Date:		2020-12-05
 Mailing List:	tech-...@netbsd.org
 Responsible:	joerg
 License:	BSD

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2762 src/doc/CHANGES:1.2763
--- src/doc/CHANGES:1.2762	Fri Dec  4 18:44:49 2020
+++ src/doc/CHANGES	Sat Dec  5 16:23:08 2020
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2762 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2763 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -308,7 +308,8 @@ Changes from NetBSD 9.0 to NetBSD 10.0:
 		except for vchiq(4) and vcaudio(4) are supported. Pi 3 is
 		capable to run both in aarch64eb and earmv7{,hf}eb modes.
 		[rin 20201201]
-	pkg_install(8): Updated to 20201202. This changes the default database
+	pkg_install: Updated to 20201202. This changes the default database
 		location from /var/db/pkg to /usr/pkg/pkgdb. [wiz 20201202]
 	libfido2: Update to 1.5.0 for OpenSSH 8.4 support [christos 20201204]
 	OpenSSH: Import 8.4. [christos 20201204]
+	pkg_install: Updated to 20201205. [wiz 20201205]

CVS commit: src/doc

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Sat Dec  5 16:23:08 UTC 2020

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
pkg_install updated to 20201205


To generate a diff of this commit:
cvs rdiff -u -r1.1766 -r1.1767 src/doc/3RDPARTY
cvs rdiff -u -r1.2762 -r1.2763 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/bsd/pkg_install/dist/lib

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Sat Dec  5 16:21:26 UTC 2020

Modified Files:
src/external/bsd/pkg_install/dist/lib: pkgdb.c version.h

Log Message:
Merge pkg_install-20201205


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/lib/pkgdb.c
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/pkg_install/dist/lib/version.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/pkg_install/dist/lib/pkgdb.c
diff -u src/external/bsd/pkg_install/dist/lib/pkgdb.c:1.3 src/external/bsd/pkg_install/dist/lib/pkgdb.c:1.4
--- src/external/bsd/pkg_install/dist/lib/pkgdb.c:1.3	Wed Dec  2 13:53:50 2020
+++ src/external/bsd/pkg_install/dist/lib/pkgdb.c	Sat Dec  5 16:21:26 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: pkgdb.c,v 1.3 2020/12/02 13:53:50 wiz Exp $	*/
+/*	$NetBSD: pkgdb.c,v 1.4 2020/12/05 16:21:26 wiz Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -7,7 +7,7 @@
 #if HAVE_SYS_CDEFS_H
 #include 
 #endif
-__RCSID("$NetBSD: pkgdb.c,v 1.3 2020/12/02 13:53:50 wiz Exp $");
+__RCSID("$NetBSD: pkgdb.c,v 1.4 2020/12/05 16:21:26 wiz Exp $");
 
 /*-
  * Copyright (c) 1999-2010 The NetBSD Foundation, Inc.
@@ -310,8 +310,9 @@ pkgdb_get_dir(void)
 	stat("/var/db/pkg", ) == 0) {
 		errx(EXIT_FAILURE,
 		 "The default PKG_DBDIR has changed, but this installation still uses the old one.\n"
-		 "Please move the database and re-run this command:\n"
-		 "\tmv /var/db/pkg " DEF_LOG_DIR);
+		 "Please move the databases and re-run this command:\n"
+		 "\tmv /var/db/pkg " DEF_LOG_DIR "\n"
+		 "\tmv /var/db/pkg.refcount " DEF_LOG_DIR ".refcount");
 	}
 
 return pkgdb_dir;

Index: src/external/bsd/pkg_install/dist/lib/version.h
diff -u src/external/bsd/pkg_install/dist/lib/version.h:1.16 src/external/bsd/pkg_install/dist/lib/version.h:1.17
--- src/external/bsd/pkg_install/dist/lib/version.h:1.16	Wed Dec  2 13:53:50 2020
+++ src/external/bsd/pkg_install/dist/lib/version.h	Sat Dec  5 16:21:26 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: version.h,v 1.16 2020/12/02 13:53:50 wiz Exp $	*/
+/*	$NetBSD: version.h,v 1.17 2020/12/05 16:21:26 wiz Exp $	*/
 
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
@@ -27,6 +27,6 @@
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
 
-#define PKGTOOLS_VERSION 20200828
+#define PKGTOOLS_VERSION 20201205
 
 #endif /* _INST_LIB_VERSION_H_ */

CVS commit: src/external/bsd/pkg_install/dist/lib

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Sat Dec  5 16:21:26 UTC 2020

Modified Files:
src/external/bsd/pkg_install/dist/lib: pkgdb.c version.h

Log Message:
Merge pkg_install-20201205


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/lib/pkgdb.c
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/pkg_install/dist/lib/version.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS import: src/external/bsd/pkg_install/dist

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Sat Dec  5 16:19:18 UTC 2020

Update of /cvsroot/src/external/bsd/pkg_install/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv1114

Log Message:
Import pkg_install 20201205

Improves the warning about the old database.

Status:

Vendor Tag: PKGSRC
Release Tags:   pkg_install-20201205

U src/external/bsd/pkg_install/dist/add/add.h
U src/external/bsd/pkg_install/dist/add/main.c
U src/external/bsd/pkg_install/dist/add/perform.c
U src/external/bsd/pkg_install/dist/add/pkg_add.1
U src/external/bsd/pkg_install/dist/admin/audit-packages.8
U src/external/bsd/pkg_install/dist/admin/admin.h
U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in
U src/external/bsd/pkg_install/dist/admin/audit.c
U src/external/bsd/pkg_install/dist/admin/check.c
U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in
U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8
U src/external/bsd/pkg_install/dist/admin/main.c
U src/external/bsd/pkg_install/dist/admin/pkg_admin.1
U src/external/bsd/pkg_install/dist/lib/parse-config.c
U src/external/bsd/pkg_install/dist/lib/automatic.c
U src/external/bsd/pkg_install/dist/lib/config.h.in
U src/external/bsd/pkg_install/dist/lib/conflicts.c
U src/external/bsd/pkg_install/dist/lib/defs.h
U src/external/bsd/pkg_install/dist/lib/dewey.c
U src/external/bsd/pkg_install/dist/lib/dewey.h
U src/external/bsd/pkg_install/dist/lib/fexec.c
U src/external/bsd/pkg_install/dist/lib/file.c
U src/external/bsd/pkg_install/dist/lib/global.c
U src/external/bsd/pkg_install/dist/lib/gpgsig.c
U src/external/bsd/pkg_install/dist/lib/iterate.c
U src/external/bsd/pkg_install/dist/lib/lib.h
U src/external/bsd/pkg_install/dist/lib/license.c
U src/external/bsd/pkg_install/dist/lib/lpkg.c
U src/external/bsd/pkg_install/dist/lib/opattern.c
U src/external/bsd/pkg_install/dist/lib/pkcs7.c
U src/external/bsd/pkg_install/dist/lib/pkg_io.c
U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c
U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in
U src/external/bsd/pkg_install/dist/lib/pkg_signature.c
U src/external/bsd/pkg_install/dist/lib/pkg_summary.5
C src/external/bsd/pkg_install/dist/lib/pkgdb.c
U src/external/bsd/pkg_install/dist/lib/pkgsrc.7
U src/external/bsd/pkg_install/dist/lib/plist.c
U src/external/bsd/pkg_install/dist/lib/remove.c
U src/external/bsd/pkg_install/dist/lib/str.c
U src/external/bsd/pkg_install/dist/lib/var.c
U src/external/bsd/pkg_install/dist/lib/version.c
C src/external/bsd/pkg_install/dist/lib/version.h
U src/external/bsd/pkg_install/dist/lib/xwrapper.c
U src/external/bsd/pkg_install/dist/create/build.c
U src/external/bsd/pkg_install/dist/create/create.h
U src/external/bsd/pkg_install/dist/create/main.c
U src/external/bsd/pkg_install/dist/create/perform.c
U src/external/bsd/pkg_install/dist/create/pkg_create.1
U src/external/bsd/pkg_install/dist/create/util.c
U src/external/bsd/pkg_install/dist/create/pl.c
U src/external/bsd/pkg_install/dist/delete/pkg_delete.1
U src/external/bsd/pkg_install/dist/delete/pkg_delete.c
U src/external/bsd/pkg_install/dist/info/info.h
U src/external/bsd/pkg_install/dist/info/main.c
U src/external/bsd/pkg_install/dist/info/perform.c
U src/external/bsd/pkg_install/dist/info/pkg_info.1
U src/external/bsd/pkg_install/dist/info/show.c
U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf
U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh
U src/external/bsd/pkg_install/dist/x509/signing.txt

2 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jPKGSRC:yesterday -jPKGSRC 
src/external/bsd/pkg_install/dist

CVS import: src/external/bsd/pkg_install/dist

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Sat Dec  5 16:19:18 UTC 2020

Update of /cvsroot/src/external/bsd/pkg_install/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv1114

Log Message:
Import pkg_install 20201205

Improves the warning about the old database.

Status:

Vendor Tag: PKGSRC
Release Tags:   pkg_install-20201205

U src/external/bsd/pkg_install/dist/add/add.h
U src/external/bsd/pkg_install/dist/add/main.c
U src/external/bsd/pkg_install/dist/add/perform.c
U src/external/bsd/pkg_install/dist/add/pkg_add.1
U src/external/bsd/pkg_install/dist/admin/audit-packages.8
U src/external/bsd/pkg_install/dist/admin/admin.h
U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in
U src/external/bsd/pkg_install/dist/admin/audit.c
U src/external/bsd/pkg_install/dist/admin/check.c
U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in
U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8
U src/external/bsd/pkg_install/dist/admin/main.c
U src/external/bsd/pkg_install/dist/admin/pkg_admin.1
U src/external/bsd/pkg_install/dist/lib/parse-config.c
U src/external/bsd/pkg_install/dist/lib/automatic.c
U src/external/bsd/pkg_install/dist/lib/config.h.in
U src/external/bsd/pkg_install/dist/lib/conflicts.c
U src/external/bsd/pkg_install/dist/lib/defs.h
U src/external/bsd/pkg_install/dist/lib/dewey.c
U src/external/bsd/pkg_install/dist/lib/dewey.h
U src/external/bsd/pkg_install/dist/lib/fexec.c
U src/external/bsd/pkg_install/dist/lib/file.c
U src/external/bsd/pkg_install/dist/lib/global.c
U src/external/bsd/pkg_install/dist/lib/gpgsig.c
U src/external/bsd/pkg_install/dist/lib/iterate.c
U src/external/bsd/pkg_install/dist/lib/lib.h
U src/external/bsd/pkg_install/dist/lib/license.c
U src/external/bsd/pkg_install/dist/lib/lpkg.c
U src/external/bsd/pkg_install/dist/lib/opattern.c
U src/external/bsd/pkg_install/dist/lib/pkcs7.c
U src/external/bsd/pkg_install/dist/lib/pkg_io.c
U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c
U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in
U src/external/bsd/pkg_install/dist/lib/pkg_signature.c
U src/external/bsd/pkg_install/dist/lib/pkg_summary.5
C src/external/bsd/pkg_install/dist/lib/pkgdb.c
U src/external/bsd/pkg_install/dist/lib/pkgsrc.7
U src/external/bsd/pkg_install/dist/lib/plist.c
U src/external/bsd/pkg_install/dist/lib/remove.c
U src/external/bsd/pkg_install/dist/lib/str.c
U src/external/bsd/pkg_install/dist/lib/var.c
U src/external/bsd/pkg_install/dist/lib/version.c
C src/external/bsd/pkg_install/dist/lib/version.h
U src/external/bsd/pkg_install/dist/lib/xwrapper.c
U src/external/bsd/pkg_install/dist/create/build.c
U src/external/bsd/pkg_install/dist/create/create.h
U src/external/bsd/pkg_install/dist/create/main.c
U src/external/bsd/pkg_install/dist/create/perform.c
U src/external/bsd/pkg_install/dist/create/pkg_create.1
U src/external/bsd/pkg_install/dist/create/util.c
U src/external/bsd/pkg_install/dist/create/pl.c
U src/external/bsd/pkg_install/dist/delete/pkg_delete.1
U src/external/bsd/pkg_install/dist/delete/pkg_delete.c
U src/external/bsd/pkg_install/dist/info/info.h
U src/external/bsd/pkg_install/dist/info/main.c
U src/external/bsd/pkg_install/dist/info/perform.c
U src/external/bsd/pkg_install/dist/info/pkg_info.1
U src/external/bsd/pkg_install/dist/info/show.c
U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf
U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh
U src/external/bsd/pkg_install/dist/x509/signing.txt

2 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jPKGSRC:yesterday -jPKGSRC 
src/external/bsd/pkg_install/dist

CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Sat Dec  5 15:57:02 UTC 2020

Modified Files:
src/usr.bin/make: targ.c

Log Message:
make(1): don't concatenate identifiers in Targ_PrintType

Concatenating identifiers makes it difficult to spot them when searching
the code.  This gets rid of the special case for OP_MEMBER and MEMBER.

The same pattern is applied in the DEBUG macro, by the way.


To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/usr.bin/make/targ.c

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/targ.c
diff -u src/usr.bin/make/targ.c:1.150 src/usr.bin/make/targ.c:1.151
--- src/usr.bin/make/targ.c:1.150	Sat Dec  5 15:35:34 2020
+++ src/usr.bin/make/targ.c	Sat Dec  5 15:57:02 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: targ.c,v 1.150 2020/12/05 15:35:34 rillig Exp $	*/
+/*	$NetBSD: targ.c,v 1.151 2020/12/05 15:57:02 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -119,7 +119,7 @@
 #include "dir.h"
 
 /*	"@(#)targ.c	8.2 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: targ.c,v 1.150 2020/12/05 15:35:34 rillig Exp $");
+MAKE_RCSID("$NetBSD: targ.c,v 1.151 2020/12/05 15:57:02 rillig Exp $");
 
 /*
  * All target nodes that appeared on the left-hand side of one of the
@@ -444,9 +444,6 @@ Targ_PrintType(int type)
 {
 	int tbit;
 
-#define PRINTBIT(attr) case CONCAT(OP_,attr): debug_printf(" ." #attr); break
-#define PRINTDBIT(attr) case CONCAT(OP_,attr): if (DEBUG(TARG))debug_printf(" ." #attr); break
-
 	type &= ~OP_OPMASK;
 
 	while (type != 0) {
@@ -454,22 +451,25 @@ Targ_PrintType(int type)
 		type &= ~tbit;
 
 		switch (tbit) {
-		PRINTBIT(OPTIONAL);
-		PRINTBIT(USE);
-		PRINTBIT(EXEC);
-		PRINTBIT(IGNORE);
-		PRINTBIT(PRECIOUS);
-		PRINTBIT(SILENT);
-		PRINTBIT(MAKE);
-		PRINTBIT(JOIN);
-		PRINTBIT(INVISIBLE);
-		PRINTBIT(NOTMAIN);
-		PRINTDBIT(LIB);
-		/*XXX: MEMBER is defined, so CONCAT(OP_,MEMBER) gives OP_"%" */
-		case OP_MEMBER: if (DEBUG(TARG))debug_printf(" .MEMBER"); break;
-		PRINTDBIT(ARCHV);
-		PRINTDBIT(MADE);
-		PRINTDBIT(PHONY);
+#define PRINTBIT(bit, name) case bit: debug_printf(" " name); break
+#define PRINTDBIT(bit, attr) case bit: if (DEBUG(TARG)) debug_printf(" " attr); break
+		PRINTBIT(OP_OPTIONAL, ".OPTIONAL");
+		PRINTBIT(OP_USE, ".USE");
+		PRINTBIT(OP_EXEC, ".EXEC");
+		PRINTBIT(OP_IGNORE, ".IGNORE");
+		PRINTBIT(OP_PRECIOUS, ".PRECIOUS");
+		PRINTBIT(OP_SILENT, ".SILENT");
+		PRINTBIT(OP_MAKE, ".MAKE");
+		PRINTBIT(OP_JOIN, ".JOIN");
+		PRINTBIT(OP_INVISIBLE, ".INVISIBLE");
+		PRINTBIT(OP_NOTMAIN, ".NOTMAIN");
+		PRINTDBIT(OP_LIB, ".LIB");
+		PRINTDBIT(OP_MEMBER, ".MEMBER");
+		PRINTDBIT(OP_ARCHV, ".ARCHV");
+		PRINTDBIT(OP_MADE, ".MADE");
+		PRINTDBIT(OP_PHONY, ".PHONY");
+#undef PRINTBIT
+#undef PRINTDBIT
 		}
 	}
 }