diff --git a/external/bsd/byacc/dist/closure.c b/external/bsd/byacc/dist/closure.c
index d55f1e6ae82d..dd1a8082554b 100644
--- a/external/bsd/byacc/dist/closure.c
+++ b/external/bsd/byacc/dist/closure.c
@@ -1,11 +1,11 @@
-/*	$NetBSD: closure.c,v 1.11 2018/12/23 20:27:23 jakllsch Exp $	*/
+/*	$NetBSD: closure.c,v 1.12 2021/02/20 22:57:56 christos Exp $	*/
 
-/* Id: closure.c,v 1.11 2014/09/18 00:40:07 tom Exp  */
+/* Id: closure.c,v 1.13 2020/09/22 20:17:00 tom Exp  */
 
 #include "defs.h"
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: closure.c,v 1.11 2018/12/23 20:27:23 jakllsch Exp $");
+__RCSID("$NetBSD: closure.c,v 1.12 2021/02/20 22:57:56 christos Exp $");
 
 Value_t *itemset;
 Value_t *itemsetend;
@@ -26,7 +26,6 @@ set_EFF(void)
 {
     unsigned *row;
     int symbol;
-    Value_t *sp;
     int rowsize;
     int i;
     int rule;
@@ -37,7 +36,7 @@ set_EFF(void)
     row = EFF;
     for (i = start_symbol; i < nsyms; i++)
     {
-	sp = derives[i];
+	Value_t *sp = derives[i];
 	for (rule = *sp; rule > 0; rule = *++sp)
 	{
 	    symbol = ritem[rrhs[rule]];
@@ -61,9 +60,7 @@ void
 set_first_derives(void)
 {
     unsigned *rrow;
-    unsigned *vrow;
     int j;
-    unsigned k;
     unsigned cword = 0;
     Value_t *rp;
 
@@ -82,8 +79,9 @@ set_first_derives(void)
     rrow = first_derives + ntokens * rulesetsize;
     for (i = start_symbol; i < nsyms; i++)
     {
-	vrow = EFF + ((i - ntokens) * varsetsize);
-	k = BITS_PER_WORD;
+	unsigned *vrow = EFF + ((i - ntokens) * varsetsize);
+	unsigned k = BITS_PER_WORD;
+
 	for (j = start_symbol; j < nsyms; k++, j++)
 	{
 	    if (k >= BITS_PER_WORD)
@@ -92,7 +90,7 @@ set_first_derives(void)
 		k = 0;
 	    }
 
-	    if (cword & (unsigned)(1 << k))
+	    if (cword & (1U << k))
 	    {
 		rp = derives[j];
 		while ((rule = *rp++) >= 0)
@@ -116,7 +114,6 @@ void
 closure(Value_t *nucleus, int n)
 {
     unsigned ruleno;
-    unsigned word;
     unsigned i;
     Value_t *csp;
     unsigned *dsp;
@@ -125,7 +122,6 @@ closure(Value_t *nucleus, int n)
 
     Value_t *csend;
     unsigned *rsend;
-    int symbol;
     Value_t itemno;
 
     rulesetsize = WORDSIZE(nrules);
@@ -136,7 +132,8 @@ closure(Value_t *nucleus, int n)
     csend = nucleus + n;
     for (csp = nucleus; csp < csend; ++csp)
     {
-	symbol = ritem[*csp];
+	int symbol = ritem[*csp];
+
 	if (ISVAR(symbol))
 	{
 	    dsp = first_derives + symbol * rulesetsize;
@@ -151,12 +148,13 @@ closure(Value_t *nucleus, int n)
     csp = nucleus;
     for (rsp = ruleset; rsp < rsend; ++rsp)
     {
-	word = *rsp;
+	unsigned word = *rsp;
+
 	if (word)
 	{
 	    for (i = 0; i < BITS_PER_WORD; ++i)
 	    {
-		if (word & (unsigned)(1 << i))
+		if (word & (1U << i))
 		{
 		    itemno = rrhs[ruleno + i];
 		    while (csp < csend && *csp < itemno)
diff --git a/external/bsd/byacc/dist/config.guess b/external/bsd/byacc/dist/config.guess
index 863f4adae577..06007334a4e2 100755
--- a/external/bsd/byacc/dist/config.guess
+++ b/external/bsd/byacc/dist/config.guess
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2019 Free Software Foundation, Inc.
+#   Copyright 1992-2020 Free Software Foundation, Inc.
 
-timestamp='2019-06-10'
+timestamp='2020-08-17'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2019 Free Software Foundation, Inc.
+Copyright 1992-2020 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -99,6 +99,8 @@ tmp=
 trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
 
 set_cc_for_build() {
+    # prevent multiple calls if $tmp is already set
+    test "$tmp" && return 0
     : "${TMPDIR=/tmp}"
     # shellcheck disable=SC2039
     { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
@@ -275,12 +277,15 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
     *:Sortix:*:*)
 	echo "$UNAME_MACHINE"-unknown-sortix
 	exit ;;
+    *:Twizzler:*:*)
+	echo "$UNAME_MACHINE"-unknown-twizzler
+	exit ;;
     *:Redox:*:*)
 	echo "$UNAME_MACHINE"-unknown-redox
 	exit ;;
     mips:OSF1:*.*)
-        echo mips-dec-osf1
-        exit ;;
+	echo mips-dec-osf1
+	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -400,7 +405,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
 	# If there is a compiler, see if it is configured for 64-bit objects.
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+	if test "$CC_FOR_BUILD" != no_compiler_found; then
 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
 		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
@@ -540,10 +545,10 @@ EOF
     AViiON:dgux:*:*)
 	# DG/UX returns AViiON for all architectures
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
+	if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110
 	then
-	    if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
-	       [ "$TARGET_BINARY_INTERFACE"x = x ]
+	    if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \
+	       test "$TARGET_BINARY_INTERFACE"x = x
 	    then
 		echo m88k-dg-dgux"$UNAME_RELEASE"
 	    else
@@ -576,7 +581,7 @@ EOF
 	echo i386-ibm-aix
 	exit ;;
     ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
+	if test -x /usr/bin/oslevel ; then
 		IBM_REV=`/usr/bin/oslevel`
 	else
 		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
@@ -616,7 +621,7 @@ EOF
 	else
 		IBM_ARCH=powerpc
 	fi
-	if [ -x /usr/bin/lslpp ] ; then
+	if test -x /usr/bin/lslpp ; then
 		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
 			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
 	else
@@ -651,7 +656,7 @@ EOF
 	    9000/31?)            HP_ARCH=m68000 ;;
 	    9000/[34]??)         HP_ARCH=m68k ;;
 	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
+		if test -x /usr/bin/getconf; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
 		    case "$sc_cpu_version" in
@@ -665,7 +670,7 @@ EOF
 			esac ;;
 		    esac
 		fi
-		if [ "$HP_ARCH" = "" ]; then
+		if test "$HP_ARCH" = ""; then
 		    set_cc_for_build
 		    sed 's/^		//' << EOF > "$dummy.c"
 
@@ -704,7 +709,7 @@ EOF
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
-	if [ "$HP_ARCH" = hppa2.0w ]
+	if test "$HP_ARCH" = hppa2.0w
 	then
 	    set_cc_for_build
 
@@ -778,7 +783,7 @@ EOF
 	echo hppa1.0-hp-osf
 	exit ;;
     i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
+	if test -x /usr/sbin/sysversion ; then
 	    echo "$UNAME_MACHINE"-unknown-osf1mk
 	else
 	    echo "$UNAME_MACHINE"-unknown-osf1
@@ -922,7 +927,7 @@ EOF
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
     alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
 	  EV56)  UNAME_MACHINE=alphaev56 ;;
 	  PCA56) UNAME_MACHINE=alphapca56 ;;
@@ -1091,7 +1096,17 @@ EOF
 	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
 	exit ;;
     x86_64:Linux:*:*)
-	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+	set_cc_for_build
+	LIBCABI=$LIBC
+	if test "$CC_FOR_BUILD" != no_compiler_found; then
+	    if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_X32 >/dev/null
+	    then
+		LIBCABI="$LIBC"x32
+	    fi
+	fi
+	echo "$UNAME_MACHINE"-pc-linux-"$LIBCABI"
 	exit ;;
     xtensa*:Linux:*:*)
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
@@ -1280,7 +1295,7 @@ EOF
 	echo mips-sony-newsos6
 	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
+	if test -d /usr/nec; then
 		echo mips-nec-sysv"$UNAME_RELEASE"
 	else
 		echo mips-unknown-sysv"$UNAME_RELEASE"
@@ -1328,6 +1343,9 @@ EOF
     *:Rhapsody:*:*)
 	echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
 	exit ;;
+    arm64:Darwin:*:*)
+	echo aarch64-apple-darwin"$UNAME_RELEASE"
+	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p`
 	case $UNAME_PROCESSOR in
@@ -1342,7 +1360,7 @@ EOF
 	else
 	    set_cc_for_build
 	fi
-	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+	if test "$CC_FOR_BUILD" != no_compiler_found; then
 	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
 		   (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		   grep IS_64BIT_ARCH >/dev/null
@@ -1625,6 +1643,12 @@ copies of config.guess and config.sub with the latest versions from:
   https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
   https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+EOF
+
+year=`echo $timestamp | sed 's,-.*,,'`
+# shellcheck disable=SC2003
+if test "`expr "\`date +%Y\`" - "$year"`" -lt 3 ; then
+   cat >&2 <<EOF
 
 If $0 has already been updated, send the following data and any
 information you think might be pertinent to config-patches@gnu.org to
@@ -1652,6 +1676,7 @@ UNAME_RELEASE = "$UNAME_RELEASE"
 UNAME_SYSTEM  = "$UNAME_SYSTEM"
 UNAME_VERSION = "$UNAME_VERSION"
 EOF
+fi
 
 exit 1
 
diff --git a/external/bsd/byacc/dist/config.sub b/external/bsd/byacc/dist/config.sub
index 5b158ac41c9a..0753e3084581 100755
--- a/external/bsd/byacc/dist/config.sub
+++ b/external/bsd/byacc/dist/config.sub
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2019 Free Software Foundation, Inc.
+#   Copyright 1992-2020 Free Software Foundation, Inc.
 
-timestamp='2019-05-23'
+timestamp='2020-08-17'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2019 Free Software Foundation, Inc.
+Copyright 1992-2020 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -124,28 +124,27 @@ case $1 in
 		;;
 	*-*-*-*)
 		basic_machine=$field1-$field2
-		os=$field3-$field4
+		basic_os=$field3-$field4
 		;;
 	*-*-*)
 		# Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
 		# parts
 		maybe_os=$field2-$field3
 		case $maybe_os in
-			nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \
-			| linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \
+			nto-qnx* | linux-* | uclinux-uclibc* \
 			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
 			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
 			| storm-chaos* | os2-emx* | rtmk-nova*)
 				basic_machine=$field1
-				os=$maybe_os
+				basic_os=$maybe_os
 				;;
 			android-linux)
 				basic_machine=$field1-unknown
-				os=linux-android
+				basic_os=linux-android
 				;;
 			*)
 				basic_machine=$field1-$field2
-				os=$field3
+				basic_os=$field3
 				;;
 		esac
 		;;
@@ -154,7 +153,7 @@ case $1 in
 		case $field1-$field2 in
 			decstation-3100)
 				basic_machine=mips-dec
-				os=
+				basic_os=
 				;;
 			*-*)
 				# Second component is usually, but not always the OS
@@ -162,7 +161,7 @@ case $1 in
 					# Prevent following clause from handling this valid os
 					sun*os*)
 						basic_machine=$field1
-						os=$field2
+						basic_os=$field2
 						;;
 					# Manufacturers
 					dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
@@ -175,11 +174,11 @@ case $1 in
 					| microblaze* | sim | cisco \
 					| oki | wec | wrs | winbond)
 						basic_machine=$field1-$field2
-						os=
+						basic_os=
 						;;
 					*)
 						basic_machine=$field1
-						os=$field2
+						basic_os=$field2
 						;;
 				esac
 			;;
@@ -191,450 +190,451 @@ case $1 in
 		case $field1 in
 			386bsd)
 				basic_machine=i386-pc
-				os=bsd
+				basic_os=bsd
 				;;
 			a29khif)
 				basic_machine=a29k-amd
-				os=udi
+				basic_os=udi
 				;;
 			adobe68k)
 				basic_machine=m68010-adobe
-				os=scout
+				basic_os=scout
 				;;
 			alliant)
 				basic_machine=fx80-alliant
-				os=
+				basic_os=
 				;;
 			altos | altos3068)
 				basic_machine=m68k-altos
-				os=
+				basic_os=
 				;;
 			am29k)
 				basic_machine=a29k-none
-				os=bsd
+				basic_os=bsd
 				;;
 			amdahl)
 				basic_machine=580-amdahl
-				os=sysv
+				basic_os=sysv
 				;;
 			amiga)
 				basic_machine=m68k-unknown
-				os=
+				basic_os=
 				;;
 			amigaos | amigados)
 				basic_machine=m68k-unknown
-				os=amigaos
+				basic_os=amigaos
 				;;
 			amigaunix | amix)
 				basic_machine=m68k-unknown
-				os=sysv4
+				basic_os=sysv4
 				;;
 			apollo68)
 				basic_machine=m68k-apollo
-				os=sysv
+				basic_os=sysv
 				;;
 			apollo68bsd)
 				basic_machine=m68k-apollo
-				os=bsd
+				basic_os=bsd
 				;;
 			aros)
 				basic_machine=i386-pc
-				os=aros
+				basic_os=aros
 				;;
 			aux)
 				basic_machine=m68k-apple
-				os=aux
+				basic_os=aux
 				;;
 			balance)
 				basic_machine=ns32k-sequent
-				os=dynix
+				basic_os=dynix
 				;;
 			blackfin)
 				basic_machine=bfin-unknown
-				os=linux
+				basic_os=linux
 				;;
 			cegcc)
 				basic_machine=arm-unknown
-				os=cegcc
+				basic_os=cegcc
 				;;
 			convex-c1)
 				basic_machine=c1-convex
-				os=bsd
+				basic_os=bsd
 				;;
 			convex-c2)
 				basic_machine=c2-convex
-				os=bsd
+				basic_os=bsd
 				;;
 			convex-c32)
 				basic_machine=c32-convex
-				os=bsd
+				basic_os=bsd
 				;;
 			convex-c34)
 				basic_machine=c34-convex
-				os=bsd
+				basic_os=bsd
 				;;
 			convex-c38)
 				basic_machine=c38-convex
-				os=bsd
+				basic_os=bsd
 				;;
 			cray)
 				basic_machine=j90-cray
-				os=unicos
+				basic_os=unicos
 				;;
 			crds | unos)
 				basic_machine=m68k-crds
-				os=
+				basic_os=
 				;;
 			da30)
 				basic_machine=m68k-da30
-				os=
+				basic_os=
 				;;
 			decstation | pmax | pmin | dec3100 | decstatn)
 				basic_machine=mips-dec
-				os=
+				basic_os=
 				;;
 			delta88)
 				basic_machine=m88k-motorola
-				os=sysv3
+				basic_os=sysv3
 				;;
 			dicos)
 				basic_machine=i686-pc
-				os=dicos
+				basic_os=dicos
 				;;
 			djgpp)
 				basic_machine=i586-pc
-				os=msdosdjgpp
+				basic_os=msdosdjgpp
 				;;
 			ebmon29k)
 				basic_machine=a29k-amd
-				os=ebmon
+				basic_os=ebmon
 				;;
 			es1800 | OSE68k | ose68k | ose | OSE)
 				basic_machine=m68k-ericsson
-				os=ose
+				basic_os=ose
 				;;
 			gmicro)
 				basic_machine=tron-gmicro
-				os=sysv
+				basic_os=sysv
 				;;
 			go32)
 				basic_machine=i386-pc
-				os=go32
+				basic_os=go32
 				;;
 			h8300hms)
 				basic_machine=h8300-hitachi
-				os=hms
+				basic_os=hms
 				;;
 			h8300xray)
 				basic_machine=h8300-hitachi
-				os=xray
+				basic_os=xray
 				;;
 			h8500hms)
 				basic_machine=h8500-hitachi
-				os=hms
+				basic_os=hms
 				;;
 			harris)
 				basic_machine=m88k-harris
-				os=sysv3
+				basic_os=sysv3
 				;;
-			hp300)
+			hp300 | hp300hpux)
 				basic_machine=m68k-hp
+				basic_os=hpux
 				;;
 			hp300bsd)
 				basic_machine=m68k-hp
-				os=bsd
-				;;
-			hp300hpux)
-				basic_machine=m68k-hp
-				os=hpux
+				basic_os=bsd
 				;;
 			hppaosf)
 				basic_machine=hppa1.1-hp
-				os=osf
+				basic_os=osf
 				;;
 			hppro)
 				basic_machine=hppa1.1-hp
-				os=proelf
+				basic_os=proelf
 				;;
 			i386mach)
 				basic_machine=i386-mach
-				os=mach
-				;;
-			vsta)
-				basic_machine=i386-pc
-				os=vsta
+				basic_os=mach
 				;;
 			isi68 | isi)
 				basic_machine=m68k-isi
-				os=sysv
+				basic_os=sysv
 				;;
 			m68knommu)
 				basic_machine=m68k-unknown
-				os=linux
+				basic_os=linux
 				;;
 			magnum | m3230)
 				basic_machine=mips-mips
-				os=sysv
+				basic_os=sysv
 				;;
 			merlin)
 				basic_machine=ns32k-utek
-				os=sysv
+				basic_os=sysv
 				;;
 			mingw64)
 				basic_machine=x86_64-pc
-				os=mingw64
+				basic_os=mingw64
 				;;
 			mingw32)
 				basic_machine=i686-pc
-				os=mingw32
+				basic_os=mingw32
 				;;
 			mingw32ce)
 				basic_machine=arm-unknown
-				os=mingw32ce
+				basic_os=mingw32ce
 				;;
 			monitor)
 				basic_machine=m68k-rom68k
-				os=coff
+				basic_os=coff
 				;;
 			morphos)
 				basic_machine=powerpc-unknown
-				os=morphos
+				basic_os=morphos
 				;;
 			moxiebox)
 				basic_machine=moxie-unknown
-				os=moxiebox
+				basic_os=moxiebox
 				;;
 			msdos)
 				basic_machine=i386-pc
-				os=msdos
+				basic_os=msdos
 				;;
 			msys)
 				basic_machine=i686-pc
-				os=msys
+				basic_os=msys
 				;;
 			mvs)
 				basic_machine=i370-ibm
-				os=mvs
+				basic_os=mvs
 				;;
 			nacl)
 				basic_machine=le32-unknown
-				os=nacl
+				basic_os=nacl
 				;;
 			ncr3000)
 				basic_machine=i486-ncr
-				os=sysv4
+				basic_os=sysv4
 				;;
 			netbsd386)
 				basic_machine=i386-pc
-				os=netbsd
+				basic_os=netbsd
 				;;
 			netwinder)
 				basic_machine=armv4l-rebel
-				os=linux
+				basic_os=linux
 				;;
 			news | news700 | news800 | news900)
 				basic_machine=m68k-sony
-				os=newsos
+				basic_os=newsos
 				;;
 			news1000)
 				basic_machine=m68030-sony
-				os=newsos
+				basic_os=newsos
 				;;
 			necv70)
 				basic_machine=v70-nec
-				os=sysv
+				basic_os=sysv
 				;;
 			nh3000)
 				basic_machine=m68k-harris
-				os=cxux
+				basic_os=cxux
 				;;
 			nh[45]000)
 				basic_machine=m88k-harris
-				os=cxux
+				basic_os=cxux
 				;;
 			nindy960)
 				basic_machine=i960-intel
-				os=nindy
+				basic_os=nindy
 				;;
 			mon960)
 				basic_machine=i960-intel
-				os=mon960
+				basic_os=mon960
 				;;
 			nonstopux)
 				basic_machine=mips-compaq
-				os=nonstopux
+				basic_os=nonstopux
 				;;
 			os400)
 				basic_machine=powerpc-ibm
-				os=os400
+				basic_os=os400
 				;;
 			OSE68000 | ose68000)
 				basic_machine=m68000-ericsson
-				os=ose
+				basic_os=ose
 				;;
 			os68k)
 				basic_machine=m68k-none
-				os=os68k
+				basic_os=os68k
 				;;
 			paragon)
 				basic_machine=i860-intel
-				os=osf
+				basic_os=osf
 				;;
 			parisc)
 				basic_machine=hppa-unknown
-				os=linux
+				basic_os=linux
+				;;
+			psp)
+				basic_machine=mipsallegrexel-sony
+				basic_os=psp
 				;;
 			pw32)
 				basic_machine=i586-unknown
-				os=pw32
+				basic_os=pw32
 				;;
 			rdos | rdos64)
 				basic_machine=x86_64-pc
-				os=rdos
+				basic_os=rdos
 				;;
 			rdos32)
 				basic_machine=i386-pc
-				os=rdos
+				basic_os=rdos
 				;;
 			rom68k)
 				basic_machine=m68k-rom68k
-				os=coff
+				basic_os=coff
 				;;
 			sa29200)
 				basic_machine=a29k-amd
-				os=udi
+				basic_os=udi
 				;;
 			sei)
 				basic_machine=mips-sei
-				os=seiux
+				basic_os=seiux
 				;;
 			sequent)
 				basic_machine=i386-sequent
-				os=
+				basic_os=
 				;;
 			sps7)
 				basic_machine=m68k-bull
-				os=sysv2
+				basic_os=sysv2
 				;;
 			st2000)
 				basic_machine=m68k-tandem
-				os=
+				basic_os=
 				;;
 			stratus)
 				basic_machine=i860-stratus
-				os=sysv4
+				basic_os=sysv4
 				;;
 			sun2)
 				basic_machine=m68000-sun
-				os=
+				basic_os=
 				;;
 			sun2os3)
 				basic_machine=m68000-sun
-				os=sunos3
+				basic_os=sunos3
 				;;
 			sun2os4)
 				basic_machine=m68000-sun
-				os=sunos4
+				basic_os=sunos4
 				;;
 			sun3)
 				basic_machine=m68k-sun
-				os=
+				basic_os=
 				;;
 			sun3os3)
 				basic_machine=m68k-sun
-				os=sunos3
+				basic_os=sunos3
 				;;
 			sun3os4)
 				basic_machine=m68k-sun
-				os=sunos4
+				basic_os=sunos4
 				;;
 			sun4)
 				basic_machine=sparc-sun
-				os=
+				basic_os=
 				;;
 			sun4os3)
 				basic_machine=sparc-sun
-				os=sunos3
+				basic_os=sunos3
 				;;
 			sun4os4)
 				basic_machine=sparc-sun
-				os=sunos4
+				basic_os=sunos4
 				;;
 			sun4sol2)
 				basic_machine=sparc-sun
-				os=solaris2
+				basic_os=solaris2
 				;;
 			sun386 | sun386i | roadrunner)
 				basic_machine=i386-sun
-				os=
+				basic_os=
 				;;
 			sv1)
 				basic_machine=sv1-cray
-				os=unicos
+				basic_os=unicos
 				;;
 			symmetry)
 				basic_machine=i386-sequent
-				os=dynix
+				basic_os=dynix
 				;;
 			t3e)
 				basic_machine=alphaev5-cray
-				os=unicos
+				basic_os=unicos
 				;;
 			t90)
 				basic_machine=t90-cray
-				os=unicos
+				basic_os=unicos
 				;;
 			toad1)
 				basic_machine=pdp10-xkl
-				os=tops20
+				basic_os=tops20
 				;;
 			tpf)
 				basic_machine=s390x-ibm
-				os=tpf
+				basic_os=tpf
 				;;
 			udi29k)
 				basic_machine=a29k-amd
-				os=udi
+				basic_os=udi
 				;;
 			ultra3)
 				basic_machine=a29k-nyu
-				os=sym1
+				basic_os=sym1
 				;;
 			v810 | necv810)
 				basic_machine=v810-nec
-				os=none
+				basic_os=none
 				;;
 			vaxv)
 				basic_machine=vax-dec
-				os=sysv
+				basic_os=sysv
 				;;
 			vms)
 				basic_machine=vax-dec
-				os=vms
+				basic_os=vms
+				;;
+			vsta)
+				basic_machine=i386-pc
+				basic_os=vsta
 				;;
 			vxworks960)
 				basic_machine=i960-wrs
-				os=vxworks
+				basic_os=vxworks
 				;;
 			vxworks68)
 				basic_machine=m68k-wrs
-				os=vxworks
+				basic_os=vxworks
 				;;
 			vxworks29k)
 				basic_machine=a29k-wrs
-				os=vxworks
+				basic_os=vxworks
 				;;
 			xbox)
 				basic_machine=i686-pc
-				os=mingw32
+				basic_os=mingw32
 				;;
 			ymp)
 				basic_machine=ymp-cray
-				os=unicos
+				basic_os=unicos
 				;;
 			*)
 				basic_machine=$1
-				os=
+				basic_os=
 				;;
 		esac
 		;;
@@ -686,17 +686,17 @@ case $basic_machine in
 	bluegene*)
 		cpu=powerpc
 		vendor=ibm
-		os=cnk
+		basic_os=cnk
 		;;
 	decsystem10* | dec10*)
 		cpu=pdp10
 		vendor=dec
-		os=tops10
+		basic_os=tops10
 		;;
 	decsystem20* | dec20*)
 		cpu=pdp10
 		vendor=dec
-		os=tops20
+		basic_os=tops20
 		;;
 	delta | 3300 | motorola-3300 | motorola-delta \
 	      | 3300-motorola | delta-motorola)
@@ -706,7 +706,7 @@ case $basic_machine in
 	dpx2*)
 		cpu=m68k
 		vendor=bull
-		os=sysv3
+		basic_os=sysv3
 		;;
 	encore | umax | mmax)
 		cpu=ns32k
@@ -715,7 +715,7 @@ case $basic_machine in
 	elxsi)
 		cpu=elxsi
 		vendor=elxsi
-		os=${os:-bsd}
+		basic_os=${basic_os:-bsd}
 		;;
 	fx2800)
 		cpu=i860
@@ -728,7 +728,7 @@ case $basic_machine in
 	h3050r* | hiux*)
 		cpu=hppa1.1
 		vendor=hitachi
-		os=hiuxwe2
+		basic_os=hiuxwe2
 		;;
 	hp3k9[0-9][0-9] | hp9[0-9][0-9])
 		cpu=hppa1.0
@@ -771,36 +771,36 @@ case $basic_machine in
 	i*86v32)
 		cpu=`echo "$1" | sed -e 's/86.*/86/'`
 		vendor=pc
-		os=sysv32
+		basic_os=sysv32
 		;;
 	i*86v4*)
 		cpu=`echo "$1" | sed -e 's/86.*/86/'`
 		vendor=pc
-		os=sysv4
+		basic_os=sysv4
 		;;
 	i*86v)
 		cpu=`echo "$1" | sed -e 's/86.*/86/'`
 		vendor=pc
-		os=sysv
+		basic_os=sysv
 		;;
 	i*86sol2)
 		cpu=`echo "$1" | sed -e 's/86.*/86/'`
 		vendor=pc
-		os=solaris2
+		basic_os=solaris2
 		;;
 	j90 | j90-cray)
 		cpu=j90
 		vendor=cray
-		os=${os:-unicos}
+		basic_os=${basic_os:-unicos}
 		;;
 	iris | iris4d)
 		cpu=mips
 		vendor=sgi
-		case $os in
+		case $basic_os in
 		    irix*)
 			;;
 		    *)
-			os=irix4
+			basic_os=irix4
 			;;
 		esac
 		;;
@@ -811,26 +811,26 @@ case $basic_machine in
 	*mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
 		cpu=m68k
 		vendor=atari
-		os=mint
+		basic_os=mint
 		;;
 	news-3600 | risc-news)
 		cpu=mips
 		vendor=sony
-		os=newsos
+		basic_os=newsos
 		;;
 	next | m*-next)
 		cpu=m68k
 		vendor=next
-		case $os in
+		case $basic_os in
 		    openstep*)
 		        ;;
 		    nextstep*)
 			;;
 		    ns2*)
-		      os=nextstep2
+		      basic_os=nextstep2
 			;;
 		    *)
-		      os=nextstep3
+		      basic_os=nextstep3
 			;;
 		esac
 		;;
@@ -841,12 +841,12 @@ case $basic_machine in
 	op50n-* | op60c-*)
 		cpu=hppa1.1
 		vendor=oki
-		os=proelf
+		basic_os=proelf
 		;;
 	pa-hitachi)
 		cpu=hppa1.1
 		vendor=hitachi
-		os=hiuxwe2
+		basic_os=hiuxwe2
 		;;
 	pbd)
 		cpu=sparc
@@ -883,12 +883,12 @@ case $basic_machine in
 	sde)
 		cpu=mipsisa32
 		vendor=sde
-		os=${os:-elf}
+		basic_os=${basic_os:-elf}
 		;;
 	simso-wrs)
 		cpu=sparclite
 		vendor=wrs
-		os=vxworks
+		basic_os=vxworks
 		;;
 	tower | tower-32)
 		cpu=m68k
@@ -905,7 +905,7 @@ case $basic_machine in
 	w89k-*)
 		cpu=hppa1.1
 		vendor=winbond
-		os=proelf
+		basic_os=proelf
 		;;
 	none)
 		cpu=none
@@ -958,11 +958,11 @@ case $cpu-$vendor in
 	# some cases the only manufacturer, in others, it is the most popular.
 	craynv-unknown)
 		vendor=cray
-		os=${os:-unicosmp}
+		basic_os=${basic_os:-unicosmp}
 		;;
 	c90-unknown | c90-cray)
 		vendor=cray
-		os=${os:-unicos}
+		basic_os=${Basic_os:-unicos}
 		;;
 	fx80-unknown)
 		vendor=alliant
@@ -1006,7 +1006,7 @@ case $cpu-$vendor in
 	dpx20-unknown | dpx20-bull)
 		cpu=rs6000
 		vendor=bull
-		os=${os:-bosx}
+		basic_os=${basic_os:-bosx}
 		;;
 
 	# Here we normalize CPU types irrespective of the vendor
@@ -1015,7 +1015,7 @@ case $cpu-$vendor in
 		;;
 	blackfin-*)
 		cpu=bfin
-		os=linux
+		basic_os=linux
 		;;
 	c54x-*)
 		cpu=tic54x
@@ -1028,7 +1028,7 @@ case $cpu-$vendor in
 		;;
 	e500v[12]-*)
 		cpu=powerpc
-		os=$os"spe"
+		basic_os=${basic_os}"spe"
 		;;
 	mips3*-*)
 		cpu=mips64
@@ -1038,7 +1038,7 @@ case $cpu-$vendor in
 		;;
 	m68knommu-*)
 		cpu=m68k
-		os=linux
+		basic_os=linux
 		;;
 	m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
 		cpu=s12z
@@ -1048,7 +1048,7 @@ case $cpu-$vendor in
 		;;
 	parisc-*)
 		cpu=hppa
-		os=linux
+		basic_os=linux
 		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		cpu=i586
@@ -1104,11 +1104,14 @@ case $cpu-$vendor in
 	xscale-* | xscalee[bl]-*)
 		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
 		;;
+	arm64-*)
+		cpu=aarch64
+		;;
 
 	# Recognize the canonical CPU Types that limit and/or modify the
 	# company names they are paired with.
 	cr16-*)
-		os=${os:-elf}
+		basic_os=${basic_os:-elf}
 		;;
 	crisv32-* | etraxfs*-*)
 		cpu=crisv32
@@ -1119,7 +1122,7 @@ case $cpu-$vendor in
 		vendor=axis
 		;;
 	crx-*)
-		os=${os:-elf}
+		basic_os=${basic_os:-elf}
 		;;
 	neo-tandem)
 		cpu=neo
@@ -1141,16 +1144,12 @@ case $cpu-$vendor in
 		cpu=nsx
 		vendor=tandem
 		;;
-	s390-*)
-		cpu=s390
-		vendor=ibm
-		;;
-	s390x-*)
-		cpu=s390x
-		vendor=ibm
+	mipsallegrexel-sony)
+		cpu=mipsallegrexel
+		vendor=sony
 		;;
 	tile*-*)
-		os=${os:-linux-gnu}
+		basic_os=${basic_os:-linux-gnu}
 		;;
 
 	*)
@@ -1167,7 +1166,7 @@ case $cpu-$vendor in
 			| am33_2.0 \
 			| amdgcn \
 			| arc | arceb \
-			| arm  | arm[lb]e | arme[lb] | armv* \
+			| arm | arm[lb]e | arme[lb] | armv* \
 			| avr | avr32 \
 			| asmjs \
 			| ba \
@@ -1232,6 +1231,7 @@ case $cpu-$vendor in
 			| pyramid \
 			| riscv | riscv32 | riscv64 \
 			| rl78 | romp | rs6000 | rx \
+			| s390 | s390x \
 			| score \
 			| sh | shl \
 			| sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
@@ -1278,8 +1278,43 @@ esac
 
 # Decode manufacturer-specific aliases for certain operating systems.
 
-if [ x$os != x ]
+if test x$basic_os != x
 then
+
+# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just
+# set os.
+case $basic_os in
+	gnu/linux*)
+		kernel=linux
+		os=`echo $basic_os | sed -e 's|gnu/linux|gnu|'`
+		;;
+	nto-qnx*)
+		kernel=nto
+		os=`echo $basic_os | sed -e 's|nto-qnx|qnx|'`
+		;;
+	*-*)
+		# shellcheck disable=SC2162
+		IFS="-" read kernel os <<EOF
+$basic_os
+EOF
+		;;
+	# Default OS when just kernel was specified
+	nto*)
+		kernel=nto
+		os=`echo $basic_os | sed -e 's|nto|qnx|'`
+		;;
+	linux*)
+		kernel=linux
+		os=`echo $basic_os | sed -e 's|linux|gnu|'`
+		;;
+	*)
+		kernel=
+		os=$basic_os
+		;;
+esac
+
+# Now, normalize the OS (knowing we just have one component, it's not a kernel,
+# etc.)
 case $os in
 	# First match some system type aliases that might get confused
 	# with valid system types.
@@ -1299,9 +1334,6 @@ case $os in
 	unixware*)
 		os=sysv4.2uw
 		;;
-	gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
 	# es1800 is here to avoid being matched by es* (a different OS)
 	es1800*)
 		os=ose
@@ -1325,10 +1357,7 @@ case $os in
 	sco3.2.[4-9]*)
 		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
 		;;
-	sco3.2v[4-9]* | sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		;;
-	scout)
+	sco*v* | scout)
 		# Don't match below
 		;;
 	sco*)
@@ -1337,40 +1366,6 @@ case $os in
 	psos*)
 		os=psos
 		;;
-	# Now accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST end in a * to match a version number.
-	# sysv* is not here because it comes later, after sysvr4.
-	gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
-	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
-	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
-	     | sym* | kopensolaris* | plan9* \
-	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
-	     | aos* | aros* | cloudabi* | sortix* \
-	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
-	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
-	     | knetbsd* | mirbsd* | netbsd* \
-	     | bitrig* | openbsd* | solidbsd* | libertybsd* \
-	     | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \
-	     | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
-	     | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
-	     | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \
-	     | chorusrdb* | cegcc* | glidix* \
-	     | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
-	     | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \
-	     | linux-newlib* | linux-musl* | linux-uclibc* \
-	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
-	     | interix* | uwin* | mks* | rhapsody* | darwin* \
-	     | openstep* | oskit* | conix* | pw32* | nonstopux* \
-	     | storm-chaos* | tops10* | tenex* | tops20* | its* \
-	     | os2* | vos* | palmos* | uclinux* | nucleus* \
-	     | morphos* | superux* | rtmk* | windiss* \
-	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
-	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
-	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
-	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
 	qnx*)
 		case $cpu in
 		    x86 | i*86)
@@ -1383,31 +1378,19 @@ case $os in
 	hiux*)
 		os=hiuxwe2
 		;;
-	nto-qnx*)
-		;;
-	nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	sim | xray | os68k* | v88r* \
-	    | windows* | osx | abug | netware* | os9* \
-	    | macos* | mpw* | magic* | mmixware* | mon960* | lnews*)
-		;;
-	linux-dietlibc)
-		os=linux-dietlibc
-		;;
-	linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
 	lynx*178)
 		os=lynxos178
 		;;
 	lynx*5)
 		os=lynxos5
 		;;
+	lynxos*)
+		# don't get caught up in next wildcard
+		;;
 	lynx*)
 		os=lynxos
 		;;
-	mac*)
+	mac[0-9]*)
 		os=`echo "$os" | sed -e 's|mac|macos|'`
 		;;
 	opened*)
@@ -1452,9 +1435,6 @@ case $os in
 	ns2)
 		os=nextstep2
 		;;
-	nsk*)
-		os=nsk
-		;;
 	# Preserve the version number of sinix5.
 	sinix5.*)
 		os=`echo $os | sed -e 's|sinix|sysv|'`
@@ -1480,18 +1460,12 @@ case $os in
 	sysvr4)
 		os=sysv4
 		;;
-	# This must come after sysvr4.
-	sysv*)
-		;;
 	ose*)
 		os=ose
 		;;
 	*mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
 		os=mint
 		;;
-	zvmoe)
-		os=zvmoe
-		;;
 	dicos*)
 		os=dicos
 		;;
@@ -1508,19 +1482,11 @@ case $os in
 			;;
 		esac
 		;;
-	nacl*)
-		;;
-	ios)
-		;;
-	none)
-		;;
-	*-eabi)
-		;;
 	*)
-		echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
-		exit 1
+		# No normalization, but not necessarily accepted, that comes below.
 		;;
 esac
+
 else
 
 # Here we handle the default operating systems that come with various machines.
@@ -1533,6 +1499,7 @@ else
 # will signal an error saying that MANUFACTURER isn't an operating
 # system, and we'll never get to this point.
 
+kernel=
 case $cpu-$vendor in
 	score-*)
 		os=elf
@@ -1544,7 +1511,8 @@ case $cpu-$vendor in
 		os=riscix1.2
 		;;
 	arm*-rebel)
-		os=linux
+		kernel=linux
+		os=gnu
 		;;
 	arm*-semi)
 		os=aout
@@ -1710,84 +1678,169 @@ case $cpu-$vendor in
 		os=none
 		;;
 esac
+
 fi
 
+# Now, validate our (potentially fixed-up) OS.
+case $os in
+	# Sometimes we do "kernel-abi", so those need to count as OSes.
+	musl* | newlib* | uclibc*)
+		;;
+	# Likewise for "kernel-libc"
+	eabi | eabihf | gnueabi | gnueabihf)
+		;;
+	# Now accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST end in a * to match a version number.
+	gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
+	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \
+	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
+	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
+	     | hiux* | abug | nacl* | netware* | windows* \
+	     | os9* | macos* | osx* | ios* \
+	     | mpw* | magic* | mmixware* | mon960* | lnews* \
+	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
+	     | aos* | aros* | cloudabi* | sortix* | twizzler* \
+	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
+	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
+	     | mirbsd* | netbsd* | dicos* | openedition* | ose* \
+	     | bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \
+	     | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
+	     | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
+	     | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
+	     | udi* | lites* | ieee* | go32* | aux* | hcos* \
+	     | chorusrdb* | cegcc* | glidix* \
+	     | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
+	     | midipix* | mingw32* | mingw64* | mint* \
+	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
+	     | interix* | uwin* | mks* | rhapsody* | darwin* \
+	     | openstep* | oskit* | conix* | pw32* | nonstopux* \
+	     | storm-chaos* | tops10* | tenex* | tops20* | its* \
+	     | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \
+	     | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \
+	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
+	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
+	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
+	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
+	     | nsk* | powerunix* | genode* | zvmoe* )
+		;;
+	# This one is extra strict with allowed versions
+	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		;;
+	none)
+		;;
+	*)
+		echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# As a final step for OS-related things, validate the OS-kernel combination
+# (given a valid OS), if there is a kernel.
+case $kernel-$os in
+	linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* | linux-musl* | linux-uclibc* )
+		;;
+	-dietlibc* | -newlib* | -musl* | -uclibc* )
+		# These are just libc implementations, not actual OSes, and thus
+		# require a kernel.
+		echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2
+		exit 1
+		;;
+	kfreebsd*-gnu* | kopensolaris*-gnu*)
+		;;
+	nto-qnx*)
+		;;
+	*-eabi* | *-gnueabi*)
+		;;
+	-*)
+		# Blank kernel with real OS is always fine.
+		;;
+	*-*)
+		echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2
+		exit 1
+		;;
+esac
+
 # Here we handle the case where we know the os, and the CPU type, but not the
 # manufacturer.  We pick the logical manufacturer.
 case $vendor in
 	unknown)
-		case $os in
-			riscix*)
+		case $cpu-$os in
+			*-riscix*)
 				vendor=acorn
 				;;
-			sunos*)
+			*-sunos*)
 				vendor=sun
 				;;
-			cnk*|-aix*)
+			*-cnk* | *-aix*)
 				vendor=ibm
 				;;
-			beos*)
+			*-beos*)
 				vendor=be
 				;;
-			hpux*)
+			*-hpux*)
 				vendor=hp
 				;;
-			mpeix*)
+			*-mpeix*)
 				vendor=hp
 				;;
-			hiux*)
+			*-hiux*)
 				vendor=hitachi
 				;;
-			unos*)
+			*-unos*)
 				vendor=crds
 				;;
-			dgux*)
+			*-dgux*)
 				vendor=dg
 				;;
-			luna*)
+			*-luna*)
 				vendor=omron
 				;;
-			genix*)
+			*-genix*)
 				vendor=ns
 				;;
-			clix*)
+			*-clix*)
 				vendor=intergraph
 				;;
-			mvs* | opened*)
+			*-mvs* | *-opened*)
 				vendor=ibm
 				;;
-			os400*)
+			*-os400*)
 				vendor=ibm
 				;;
-			ptx*)
+			s390-* | s390x-*)
+				vendor=ibm
+				;;
+			*-ptx*)
 				vendor=sequent
 				;;
-			tpf*)
+			*-tpf*)
 				vendor=ibm
 				;;
-			vxsim* | vxworks* | windiss*)
+			*-vxsim* | *-vxworks* | *-windiss*)
 				vendor=wrs
 				;;
-			aux*)
+			*-aux*)
 				vendor=apple
 				;;
-			hms*)
+			*-hms*)
 				vendor=hitachi
 				;;
-			mpw* | macos*)
+			*-mpw* | *-macos*)
 				vendor=apple
 				;;
-			*mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
+			*-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*)
 				vendor=atari
 				;;
-			vos*)
+			*-vos*)
 				vendor=stratus
 				;;
 		esac
 		;;
 esac
 
-echo "$cpu-$vendor-$os"
+echo "$cpu-$vendor-${kernel:+$kernel-}$os"
 exit
 
 # Local variables:
diff --git a/external/bsd/byacc/dist/config_h.in b/external/bsd/byacc/dist/config_h.in
index a6b416d3e5e5..1b0fd6e239f6 100644
--- a/external/bsd/byacc/dist/config_h.in
+++ b/external/bsd/byacc/dist/config_h.in
@@ -21,6 +21,15 @@
 /* Define if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
+/* Define if you have the `getopt' function. */
+#undef HAVE_GETOPT
+
+/* Define if you have the <getopt.h> header file. */
+#undef HAVE_GETOPT_H
+
+/* Define to 1 if getopt variables are declared in header */
+#undef HAVE_GETOPT_HEADER
+
 /* Define if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
@@ -66,6 +75,9 @@
 /* Define to 1 if filesystem supports mixed-case filenames. */
 #undef MIXEDCASE_FILENAMES
 
+/* Define to 1 if we must include getopt.h */
+#undef NEED_GETOPT_H
+
 /* Define to 1 if you want to perform memory-leak testing. */
 #undef NO_LEAKS
 
diff --git a/external/bsd/byacc/dist/defs.h b/external/bsd/byacc/dist/defs.h
index b6306ae2b222..f14edf401ca9 100644
--- a/external/bsd/byacc/dist/defs.h
+++ b/external/bsd/byacc/dist/defs.h
@@ -1,6 +1,6 @@
-/*	$NetBSD: defs.h,v 1.18 2020/05/22 22:59:14 jmcneill Exp $	*/
+/*	$NetBSD: defs.h,v 1.19 2021/02/20 22:57:56 christos Exp $	*/
 
-/* Id: defs.h,v 1.61 2019/06/16 15:07:51 tom Exp  */
+/* Id: defs.h,v 1.66 2020/09/10 20:21:20 tom Exp  */
 
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
@@ -22,8 +22,8 @@
 #define class myClass
 #endif
 
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 
 #define CONCAT(first,second)    first #second
 #define CONCAT1(string,number)  CONCAT(string, number)
@@ -107,40 +107,48 @@
 
 /* keyword codes */
 
-#define TOKEN 0
-#define LEFT 1
-#define RIGHT 2
-#define NONASSOC 3
-#define MARK 4
-#define TEXT 5
-#define TYPE 6
-#define START 7
-#define UNION 8
-#define IDENT 9
-#define EXPECT 10
-#define EXPECT_RR 11
-#define PURE_PARSER 12
-#define PARSE_PARAM 13
-#define LEX_PARAM 14
-#define POSIX_YACC 15
-#define TOKEN_TABLE 16
-#define ERROR_VERBOSE 17
-#define XXXDEBUG 18
-#define XCODE 19
+typedef enum
+{
+    TOKEN = 0
+    ,LEFT
+    ,RIGHT
+    ,NONASSOC
+    ,MARK
+    ,TEXT
+    ,TYPE
+    ,START
+    ,UNION
+    ,IDENT
+    ,EXPECT
+    ,EXPECT_RR
+    ,PURE_PARSER
+    ,PARSE_PARAM
+    ,LEX_PARAM
+    ,POSIX_YACC
+    ,TOKEN_TABLE
+    ,ERROR_VERBOSE
+    ,XXXDEBUG
+    ,XCODE
 
 #if defined(YYBTYACC)
-#define LOCATIONS 20
-#define DESTRUCTOR 21
-#define INITIAL_ACTION 22
+    ,LOCATIONS
+    ,DESTRUCTOR
+    ,INITIAL_ACTION
 #endif
+}
+KEY_CASES;
 
 /*  symbol classes  */
 
-#define UNKNOWN 0
-#define TERM 1
-#define NONTERM 2
-#define ACTION 3
-#define ARGUMENT 4
+typedef enum
+{
+    UNKNOWN = 0
+    ,TERM
+    ,NONTERM
+    ,ACTION
+    ,ARGUMENT
+}
+SYM_CASES;
 
 /*  the undefined value  */
 
@@ -157,7 +165,6 @@
 #define IS_NAME2(c)	(isalnum(UCH(c)) || (c) == '_' || (c) == '$')
 #define IS_IDENT(c)	(isalnum(UCH(c)) || (c) == '_' || (c) == '.' || (c) == '$')
 #define	IS_OCTAL(c)	((c) >= '0' && (c) <= '7')
-#define	NUMERIC_VALUE(c)	((c) - '0')
 
 /*  symbol macros  */
 
@@ -567,6 +574,7 @@ struct mstring
 extern void msprintf(struct mstring *, const char *, ...) GCC_PRINTFLIKE(2,3);
 extern int mputchar(struct mstring *, int);
 extern struct mstring *msnew(void);
+extern struct mstring *msrenew(char *);
 extern char *msdone(struct mstring *);
 extern int strnscmp(const char *, const char *);
 extern unsigned int strnshash(const char *);
@@ -581,16 +589,23 @@ extern void output(void);
 /* reader.c */
 extern void reader(void);
 
-#define CODE_HEADER 0
-#define CODE_REQUIRES 1
-#define CODE_PROVIDES 2
-#define CODE_TOP 3
-#define CODE_IMPORTS 4
-#define CODE_MAX 5
-struct code_lines {
-	char *lines;
-	size_t num;
-};
+typedef enum
+{
+    CODE_HEADER = 0
+    ,CODE_REQUIRES
+    ,CODE_PROVIDES
+    ,CODE_TOP
+    ,CODE_IMPORTS
+    ,CODE_MAX		/* this must be last */
+}
+CODE_CASES;
+extern struct code_lines
+{
+    const char *name;
+    char *lines;
+    size_t num;
+}
+code_lines[CODE_MAX];
 
 /* skeleton.c (generated by skel2c) */
 extern void write_section(FILE * fp, const char *const section[]);
diff --git a/external/bsd/byacc/dist/graph.c b/external/bsd/byacc/dist/graph.c
index f187fcfd790c..1a64fe8ae472 100644
--- a/external/bsd/byacc/dist/graph.c
+++ b/external/bsd/byacc/dist/graph.c
@@ -1,10 +1,10 @@
-/*	$NetBSD: graph.c,v 1.8 2018/12/23 20:27:23 jakllsch Exp $	*/
+/*	$NetBSD: graph.c,v 1.9 2021/02/20 22:57:56 christos Exp $	*/
 
 #include "defs.h"
-/* Id: graph.c,v 1.8 2014/02/19 00:46:57 Tom.Shields Exp  */
+/* Id: graph.c,v 1.9 2020/09/10 17:22:51 tom Exp  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: graph.c,v 1.8 2018/12/23 20:27:23 jakllsch Exp $");
+__RCSID("$NetBSD: graph.c,v 1.9 2021/02/20 22:57:56 christos Exp $");
 
 static void graph_state(int stateno);
 static void graph_LA(int ruleno);
@@ -56,15 +56,16 @@ static void
 graph_state(int stateno)
 {
     Value_t *isp;
-    int rule;
     Value_t *sp;
-    Value_t *sp1;
 
     larno = (unsigned)lookaheads[stateno];
     fprintf(graph_file, "\n\tq%d [label=\"%d:\\l", stateno, stateno);
 
     for (isp = itemset; isp < itemsetend; isp++)
     {
+	Value_t *sp1;
+	int rule;
+
 	sp1 = sp = ritem + *isp;
 
 	while (*sp >= 0)
@@ -94,15 +95,14 @@ graph_state(int stateno)
 static void
 graph_LA(int ruleno)
 {
-    int i;
     unsigned tokensetsize;
-    unsigned *rowp;
 
     tokensetsize = (unsigned)WORDSIZE(ntokens);
 
     if (ruleno == LAruleno[larno])
     {
-	rowp = LA + larno * tokensetsize;
+	int i;
+	unsigned *rowp = LA + larno * tokensetsize;
 
 	fprintf(graph_file, " { ");
 	for (i = ntokens - 1; i >= 0; i--)
diff --git a/external/bsd/byacc/dist/lalr.c b/external/bsd/byacc/dist/lalr.c
index 04cdfb6f5b79..cab25d1e750c 100644
--- a/external/bsd/byacc/dist/lalr.c
+++ b/external/bsd/byacc/dist/lalr.c
@@ -1,10 +1,10 @@
-/*	$NetBSD: lalr.c,v 1.10 2018/12/23 20:27:23 jakllsch Exp $	*/
+/*	$NetBSD: lalr.c,v 1.11 2021/02/20 22:57:56 christos Exp $	*/
 
 #include "defs.h"
-/* Id: lalr.c,v 1.12 2016/06/07 00:28:03 tom Exp  */
+/* Id: lalr.c,v 1.13 2020/09/10 17:26:21 tom Exp  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: lalr.c,v 1.10 2018/12/23 20:27:23 jakllsch Exp $");
+__RCSID("$NetBSD: lalr.c,v 1.11 2021/02/20 22:57:56 christos Exp $");
 
 typedef struct shorts
 {
@@ -187,7 +187,6 @@ set_goto_map(void)
     Value_t *temp_base;
     Value_t *temp_map;
     Value_t state2;
-    Value_t state1;
 
     goto_base = NEW2(nvars + 1, Value_t);
     temp_base = NEW2(nvars + 1, Value_t);
@@ -231,7 +230,8 @@ set_goto_map(void)
 
     for (sp = first_shift; sp; sp = sp->next)
     {
-	state1 = sp->number;
+	Value_t state1 = sp->number;
+
 	for (i = sp->nshifts - 1; i >= 0; i--)
 	{
 	    state2 = sp->shift[i];
@@ -254,16 +254,14 @@ set_goto_map(void)
 static Value_t
 map_goto(int state, int symbol)
 {
-    int high;
-    int low;
-    int middle;
-    int s;
-
-    low = goto_map[symbol];
-    high = goto_map[symbol + 1];
+    int low = goto_map[symbol];
+    int high = goto_map[symbol + 1];
 
     for (;;)
     {
+	int middle;
+	int s;
+
 	assert(low <= high);
 	middle = (low + high) >> 1;
 	s = from_state[middle];
@@ -288,7 +286,6 @@ initialize_F(void)
     Value_t *rp;
     Value_t **reads;
     int nedges;
-    int stateno;
     int symbol;
     int nwords;
 
@@ -302,7 +299,8 @@ initialize_F(void)
     rowp = F;
     for (i = 0; i < ngotos; i++)
     {
-	stateno = to_state[i];
+	int stateno = to_state[i];
+
 	sp = shift_table[stateno];
 
 	if (sp)
@@ -362,11 +360,8 @@ build_relations(void)
     Value_t *rp;
     shifts *sp;
     int length;
-    int nedges;
     int done_flag;
-    Value_t state1;
     Value_t stateno;
-    int symbol1;
     int symbol2;
     Value_t *shortp;
     Value_t *edge;
@@ -379,9 +374,9 @@ build_relations(void)
 
     for (i = 0; i < ngotos; i++)
     {
-	nedges = 0;
-	state1 = from_state[i];
-	symbol1 = accessing_symbol[to_state[i]];
+	int nedges = 0;
+	int symbol1 = accessing_symbol[to_state[i]];
+	Value_t state1 = from_state[i];
 
 	for (rulep = derives[symbol1]; *rulep >= 0; rulep++)
 	{
@@ -479,7 +474,6 @@ transpose(Value_t **R2, int n)
     Value_t *nedges;
     Value_t *sp;
     int i;
-    int k;
 
     nedges = NEW2(n, Value_t);
 
@@ -498,7 +492,8 @@ transpose(Value_t **R2, int n)
 
     for (i = 0; i < n; i++)
     {
-	k = nedges[i];
+	int k = nedges[i];
+
 	if (k > 0)
 	{
 	    sp = NEW2(k + 1, Value_t);
@@ -650,10 +645,10 @@ traverse(int i)
 void
 lalr_leaks(void)
 {
-    int i;
-
     if (includes != 0)
     {
+	int i;
+
 	for (i = 0; i < ngotos; i++)
 	{
 	    free(includes[i]);
diff --git a/external/bsd/byacc/dist/lr0.c b/external/bsd/byacc/dist/lr0.c
index be7e58725bfe..813dd4891738 100644
--- a/external/bsd/byacc/dist/lr0.c
+++ b/external/bsd/byacc/dist/lr0.c
@@ -1,11 +1,11 @@
-/*	$NetBSD: lr0.c,v 1.12 2018/12/23 20:27:23 jakllsch Exp $	*/
+/*	$NetBSD: lr0.c,v 1.13 2021/02/20 22:57:56 christos Exp $	*/
 
-/* Id: lr0.c,v 1.19 2016/06/07 00:21:53 tom Exp  */
+/* Id: lr0.c,v 1.20 2020/09/10 17:30:37 tom Exp  */
 
 #include "defs.h"
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: lr0.c,v 1.12 2018/12/23 20:27:23 jakllsch Exp $");
+__RCSID("$NetBSD: lr0.c,v 1.13 2021/02/20 22:57:56 christos Exp $");
 
 static core *new_state(int symbol);
 static Value_t get_state(int symbol);
@@ -49,7 +49,6 @@ allocate_itemsets(void)
 {
     Value_t *itemp;
     Value_t *item_end;
-    int symbol;
     int i;
     int count;
     int max;
@@ -61,7 +60,8 @@ allocate_itemsets(void)
     item_end = ritem + nitems;
     for (itemp = ritem; itemp < item_end; itemp++)
     {
-	symbol = *itemp;
+	int symbol = *itemp;
+
 	if (symbol >= 0)
 	{
 	    count++;
@@ -99,7 +99,6 @@ static void
 append_states(void)
 {
     int i;
-    int j;
     Value_t symbol;
 
 #ifdef	TRACE
@@ -107,8 +106,9 @@ append_states(void)
 #endif
     for (i = 1; i < nshifts; i++)
     {
+	int j = i;
+
 	symbol = shift_symbol[i];
-	j = i;
 	while (j > 0 && shift_symbol[j - 1] > symbol)
 	{
 	    shift_symbol[j] = shift_symbol[j - 1];
@@ -166,10 +166,8 @@ get_state(int symbol)
 {
     int key;
     Value_t *isp1;
-    Value_t *isp2;
     Value_t *iend;
     core *sp;
-    int found;
     int n;
 
 #ifdef	TRACE
@@ -185,11 +183,14 @@ get_state(int symbol)
     sp = state_set[key];
     if (sp)
     {
-	found = 0;
+	int found = 0;
+
 	while (!found)
 	{
 	    if (sp->nitems == n)
 	    {
+		Value_t *isp2;
+
 		found = 1;
 		isp1 = kernel_base[symbol];
 		isp2 = sp->items;
@@ -257,7 +258,6 @@ new_itemsets(void)
     int shiftcount;
     Value_t *isp;
     Value_t *ksp;
-    Value_t symbol;
 
     for (i = 0; i < nsyms; i++)
 	kernel_end[i] = 0;
@@ -266,8 +266,9 @@ new_itemsets(void)
     isp = itemset;
     while (isp < itemsetend)
     {
-	i = *isp++;
-	symbol = ritem[i];
+	int j = *isp++;
+	Value_t symbol = ritem[j];
+
 	if (symbol > 0)
 	{
 	    ksp = kernel_end[symbol];
@@ -277,7 +278,7 @@ new_itemsets(void)
 		ksp = kernel_base[symbol];
 	    }
 
-	    *ksp++ = (Value_t)(i + 1);
+	    *ksp++ = (Value_t)(j + 1);
 	    kernel_end[symbol] = ksp;
 	}
     }
@@ -440,16 +441,14 @@ save_reductions(void)
 {
     Value_t *isp;
     Value_t *rp1;
-    Value_t *rp2;
-    int item;
     Value_t count;
     reductions *p;
-    Value_t *rend;
 
     count = 0;
     for (isp = itemset; isp < itemsetend; isp++)
     {
-	item = ritem[*isp];
+	int item = ritem[*isp];
+
 	if (item < 0)
 	{
 	    redset[count++] = (Value_t)-item;
@@ -458,6 +457,9 @@ save_reductions(void)
 
     if (count)
     {
+	Value_t *rp2;
+	Value_t *rend;
+
 	p = (reductions *)allocate((sizeof(reductions) +
 				      (unsigned)(count - 1) *
 				    sizeof(Value_t)));
diff --git a/external/bsd/byacc/dist/main.c b/external/bsd/byacc/dist/main.c
index 33430e31f540..76df58a4a187 100644
--- a/external/bsd/byacc/dist/main.c
+++ b/external/bsd/byacc/dist/main.c
@@ -1,13 +1,13 @@
-/*	$NetBSD: main.c,v 1.18 2019/10/06 23:29:42 christos Exp $	*/
+/*	$NetBSD: main.c,v 1.19 2021/02/20 22:57:56 christos Exp $	*/
 
 #include "defs.h"
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: main.c,v 1.18 2019/10/06 23:29:42 christos Exp $");
-/* Id: main.c,v 1.65 2019/06/16 19:59:58 tom Exp  */
+__RCSID("$NetBSD: main.c,v 1.19 2021/02/20 22:57:56 christos Exp $");
+/* Id: main.c,v 1.70 2020/09/10 17:32:55 tom Exp  */
 
 #include <signal.h>
-#ifndef _WIN32
+#if !defined(_WIN32) || defined(__MINGW32__)
 #include <unistd.h>		/* for _exit() */
 #else
 #include <stdlib.h>		/* for _exit() */
@@ -317,6 +317,46 @@ static void
 getargs(int argc, char *argv[])
 {
     int i;
+#ifdef HAVE_GETOPT
+    int ch;
+
+    if (argc > 0)
+	myname = argv[0];
+
+    while ((ch = getopt(argc, argv, "Bb:dgH:ilLo:Pp:rstVvy")) != -1)
+    {
+	switch (ch)
+	{
+	case 'b':
+	    file_prefix = optarg;
+	    break;
+	case 'H':
+	    dflag = dflag2 = 1;
+	    defines_file_name = optarg;
+	    break;
+	case 'o':
+	    output_file_name = optarg;
+	    break;
+	case 'p':
+	    symbol_prefix = optarg;
+	    break;
+	default:
+	    setflag(ch);
+	    break;
+	}
+    }
+    if ((i = optind) < argc)
+    {
+	/* getopt handles "--" specially, while we handle "-" specially */
+	if (!strcmp(argv[i], "-"))
+	{
+	    if ((i + 1) < argc)
+		usage();
+	    input_file = stdin;
+	    return;
+	}
+    }
+#else
     char *s;
     int ch;
 
@@ -398,7 +438,9 @@ getargs(int argc, char *argv[])
       end_of_option:;
     }
 
-  no_more_options:;
+  no_more_options:
+
+#endif /* HAVE_GETOPT */
     if (i + 1 != argc)
 	usage();
     input_file_name_len = strlen(argv[i]);
@@ -622,10 +664,8 @@ open_tmpfile(const char *label)
 #define MY_FMT "%s/%.*sXXXXXX"
     FILE *result;
 #if USE_MKSTEMP
-    int fd;
     const char *tmpdir;
     char *name;
-    const char *mark;
 
     if (((tmpdir = getenv("TMPDIR")) == 0 || access(tmpdir, W_OK) != 0) ||
 	((tmpdir = getenv("TEMP")) == 0 || access(tmpdir, W_OK) != 0))
@@ -648,6 +688,9 @@ open_tmpfile(const char *label)
     result = 0;
     if (name != 0)
     {
+	int fd;
+	const char *mark;
+
 	mode_t save_umask = umask(0177);
 
 	if ((mark = strrchr(label, '_')) == 0)
@@ -655,27 +698,28 @@ open_tmpfile(const char *label)
 
 	sprintf(name, MY_FMT, tmpdir, (int)(mark - label), label);
 	fd = mkstemp(name);
-	if (fd >= 0)
+	if (fd >= 0
+	    && (result = fdopen(fd, "w+")) != 0)
 	{
-	    result = fdopen(fd, "w+");
-	    if (result != 0)
+	    MY_TMPFILES *item;
+
+	    if (my_tmpfiles == 0)
 	    {
-		MY_TMPFILES *item;
-
-		if (my_tmpfiles == 0)
-		{
-		    atexit(close_tmpfiles);
-		}
-
-		item = NEW(MY_TMPFILES);
-		NO_SPACE(item);
-
-		item->name = name;
-		NO_SPACE(item->name);
-
-		item->next = my_tmpfiles;
-		my_tmpfiles = item;
+		atexit(close_tmpfiles);
 	    }
+
+	    item = NEW(MY_TMPFILES);
+	    NO_SPACE(item);
+
+	    item->name = name;
+	    NO_SPACE(item->name);
+
+	    item->next = my_tmpfiles;
+	    my_tmpfiles = item;
+	}
+	else
+	{
+	    FREE(name);
 	}
 	(void)umask(save_umask);
     }
diff --git a/external/bsd/byacc/dist/mkpar.c b/external/bsd/byacc/dist/mkpar.c
index 44c0c390d766..ecf18df5aa12 100644
--- a/external/bsd/byacc/dist/mkpar.c
+++ b/external/bsd/byacc/dist/mkpar.c
@@ -1,11 +1,11 @@
-/*	$NetBSD: mkpar.c,v 1.12 2018/12/23 20:27:23 jakllsch Exp $	*/
+/*	$NetBSD: mkpar.c,v 1.13 2021/02/20 22:57:56 christos Exp $	*/
 
-/* Id: mkpar.c,v 1.15 2016/06/07 00:22:12 tom Exp  */
+/* Id: mkpar.c,v 1.17 2020/09/10 17:37:33 tom Exp  */
 
 #include "defs.h"
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: mkpar.c,v 1.12 2018/12/23 20:27:23 jakllsch Exp $");
+__RCSID("$NetBSD: mkpar.c,v 1.13 2021/02/20 22:57:56 christos Exp $");
 
 #define NotSuppressed(p)	((p)->suppressed == 0)
 
@@ -81,18 +81,19 @@ get_shifts(int stateno)
     action *actions, *temp;
     shifts *sp;
     Value_t *to_state2;
-    Value_t i, k;
-    Value_t symbol;
 
     actions = 0;
     sp = shift_table[stateno];
     if (sp)
     {
+	Value_t i;
+
 	to_state2 = sp->shift;
 	for (i = (Value_t)(sp->nshifts - 1); i >= 0; i--)
 	{
-	    k = to_state2[i];
-	    symbol = accessing_symbol[k];
+	    Value_t k = to_state2[i];
+	    Value_t symbol = accessing_symbol[k];
+
 	    if (ISTOKEN(symbol))
 	    {
 		temp = NEW(action);
@@ -113,16 +114,16 @@ static action *
 add_reductions(int stateno, action *actions)
 {
     int i, j, m, n;
-    int ruleno, tokensetsize;
-    unsigned *rowp;
+    int tokensetsize;
 
     tokensetsize = WORDSIZE(ntokens);
     m = lookaheads[stateno];
     n = lookaheads[stateno + 1];
     for (i = m; i < n; i++)
     {
-	ruleno = LAruleno[i];
-	rowp = LA + i * tokensetsize;
+	int ruleno = LAruleno[i];
+	unsigned *rowp = LA + i * tokensetsize;
+
 	for (j = ntokens - 1; j >= 0; j--)
 	{
 	    if (BIT(rowp, j))
@@ -175,18 +176,21 @@ add_reduce(action *actions,
 static void
 find_final_state(void)
 {
-    int goal, i;
     Value_t *to_state2;
     shifts *p;
 
-    p = shift_table[0];
-    to_state2 = p->shift;
-    goal = ritem[1];
-    for (i = p->nshifts - 1; i >= 0; --i)
+    if ((p = shift_table[0]) != 0)
     {
-	final_state = to_state2[i];
-	if (accessing_symbol[final_state] == goal)
-	    break;
+	int i;
+	int goal = ritem[1];
+
+	to_state2 = p->shift;
+	for (i = p->nshifts - 1; i >= 0; --i)
+	{
+	    final_state = to_state2[i];
+	    if (accessing_symbol[final_state] == goal)
+		break;
+	}
     }
 }
 
@@ -229,7 +233,6 @@ static void
 remove_conflicts(void)
 {
     int i;
-    int symbol;
     action *p, *pref = 0;
 
     SRtotal = 0;
@@ -238,9 +241,10 @@ remove_conflicts(void)
     RRconflicts = NEW2(nstates, Value_t);
     for (i = 0; i < nstates; i++)
     {
+	int symbol = -1;
+
 	SRcount = 0;
 	RRcount = 0;
-	symbol = -1;
 #if defined(YYBTYACC)
 	pref = NULL;
 #endif
diff --git a/external/bsd/byacc/dist/mstring.c b/external/bsd/byacc/dist/mstring.c
index b25ab4b13889..1f734f7a2e91 100644
--- a/external/bsd/byacc/dist/mstring.c
+++ b/external/bsd/byacc/dist/mstring.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: mstring.c,v 1.5 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: mstring.c,v 1.6 2021/02/20 22:57:56 christos Exp $	*/
 
-/* Id: mstring.c,v 1.7 2016/12/02 17:57:21 tom Exp  */
+/* Id: mstring.c,v 1.9 2019/11/19 23:54:53 tom Exp  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: mstring.c,v 1.5 2017/02/11 19:33:12 christos Exp $");
+__RCSID("$NetBSD: mstring.c,v 1.6 2021/02/20 22:57:56 christos Exp $");
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -20,13 +20,11 @@ __RCSID("$NetBSD: mstring.c,v 1.5 2017/02/11 19:33:12 christos Exp $");
 #define HEAD	24
 #define TAIL	8
 
-#if defined(YYBTYACC)
-
 static char *buf_ptr;
 static size_t buf_len;
 
 void
-msprintf(struct mstring *s, const char *fmt,...)
+msprintf(struct mstring *s, const char *fmt, ...)
 {
     va_list args;
     size_t len;
@@ -99,7 +97,6 @@ msprintf(struct mstring *s, const char *fmt,...)
     memcpy(s->ptr, buf_ptr, len);
     s->ptr += len;
 }
-#endif
 
 int
 mputchar(struct mstring *s, int ch)
@@ -144,6 +141,20 @@ msnew(void)
     return n;
 }
 
+struct mstring *
+msrenew(char *value)
+{
+    struct mstring *r = 0;
+    if (value != 0)
+    {
+	r = msnew();
+	r->base = value;
+	r->end = value + strlen(value);
+	r->ptr = r->end;
+    }
+    return r;
+}
+
 char *
 msdone(struct mstring *s)
 {
@@ -206,10 +217,8 @@ strnshash(const char *s)
 void
 mstring_leaks(void)
 {
-#if defined(YYBTYACC)
     free(buf_ptr);
     buf_ptr = 0;
     buf_len = 0;
-#endif
 }
 #endif
diff --git a/external/bsd/byacc/dist/output.c b/external/bsd/byacc/dist/output.c
index 92f92c0c28f1..d24e1161b295 100644
--- a/external/bsd/byacc/dist/output.c
+++ b/external/bsd/byacc/dist/output.c
@@ -1,11 +1,11 @@
-/*	$NetBSD: output.c,v 1.22 2020/05/22 22:59:14 jmcneill Exp $	*/
+/*	$NetBSD: output.c,v 1.23 2021/02/20 22:57:56 christos Exp $	*/
 
-/* Id: output.c,v 1.87 2018/05/10 09:08:46 tom Exp  */
+/* Id: output.c,v 1.94 2020/09/10 20:24:30 tom Exp  */
 
 #include "defs.h"
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: output.c,v 1.22 2020/05/22 22:59:14 jmcneill Exp $");
+__RCSID("$NetBSD: output.c,v 1.23 2021/02/20 22:57:56 christos Exp $");
 
 #define StaticOrR	(rflag ? "" : "static ")
 #define CountLine(fp)   (!rflag || ((fp) == code_file))
@@ -36,18 +36,6 @@ static Value_t *check;
 static int lowzero;
 static long high;
 
-struct code_lines code_lines[CODE_MAX];
-
-static void
-output_code_lines(FILE *fp, int cl)
-{
-    if (code_lines[cl].lines == NULL)
-	return;
-    if (fp == code_file)
-	outline += code_lines[cl].num;
-    fputs(code_lines[cl].lines, fp);
-}
-
 static void
 putc_code(FILE * fp, int c)
 {
@@ -202,6 +190,27 @@ output_prefix(FILE * fp)
     fprintf(fp, "#define YYPREFIX \"%s\"\n", symbol_prefix);
 }
 
+static void
+output_code_lines(FILE * fp, int cl)
+{
+    if (code_lines[cl].lines != NULL)
+    {
+	if (fp == code_file)
+	{
+	    outline += (int)code_lines[cl].num;
+	    outline += 3;
+	    fprintf(fp, "\n");
+	}
+	fprintf(fp, "/* %%code \"%s\" block start */\n", code_lines[cl].name);
+	fputs(code_lines[cl].lines, fp);
+	fprintf(fp, "/* %%code \"%s\" block end */\n", code_lines[cl].name);
+	if (fp == code_file)
+	{
+	    write_code_lineno(fp);
+	}
+    }
+}
+
 static void
 output_newline(void)
 {
@@ -368,11 +377,11 @@ output_yydefred(void)
 static void
 output_accessing_symbols(void)
 {
-    int i, j;
-    int *translate;
-
     if (nstates != 0)
     {
+	int i, j;
+	int *translate;
+
 	translate = TMALLOC(int, nstates);
 	NO_SPACE(translate);
 
@@ -787,11 +796,9 @@ static int
 matching_vector(int vector)
 {
     int i;
-    int j;
     int k;
     int t;
     int w;
-    int match;
     int prev;
 
     i = order[vector];
@@ -803,19 +810,25 @@ matching_vector(int vector)
 
     for (prev = vector - 1; prev >= 0; prev--)
     {
-	j = order[prev];
+	int j = order[prev];
+
 	if (width[j] != w || tally[j] != t)
-	    return (-1);
-
-	match = 1;
-	for (k = 0; match && k < t; k++)
 	{
-	    if (tos[j][k] != tos[i][k] || froms[j][k] != froms[i][k])
-		match = 0;
+	    return (-1);
 	}
+	else
+	{
+	    int match = 1;
 
-	if (match)
-	    return (j);
+	    for (k = 0; match && k < t; k++)
+	    {
+		if (tos[j][k] != tos[i][k] || froms[j][k] != froms[i][k])
+		    match = 0;
+	    }
+
+	    if (match)
+		return (j);
+	}
     }
 
     return (-1);
@@ -909,7 +922,6 @@ pack_table(void)
 {
     int i;
     Value_t place;
-    int state;
 
     base = NEW2(nvectors, Value_t);
     pos = NEW2(nentries, Value_t);
@@ -926,7 +938,7 @@ pack_table(void)
 
     for (i = 0; i < nentries; i++)
     {
-	state = matching_vector(i);
+	int state = matching_vector(i);
 
 	if (state < 0)
 	    place = (Value_t)pack_vector(i);
@@ -1221,11 +1233,16 @@ static void
 output_defines(FILE * fp)
 {
     int c, i;
-    char *s;
+
+    if (fp == defines_file)
+    {
+	output_code_lines(fp, CODE_REQUIRES);
+    }
 
     for (i = 2; i < ntokens; ++i)
     {
-	s = symbol_name[i];
+	char *s = symbol_name[i];
+
 	if (is_C_identifier(s) && (!sflag || *s != '"'))
 	{
 	    fprintf(fp, "#define ");
@@ -1258,7 +1275,6 @@ output_defines(FILE * fp)
 
     if (fp == defines_file)
     {
-	output_code_lines(fp, CODE_REQUIRES);
 	output_code_lines(fp, CODE_PROVIDES);
     }
 
@@ -1301,9 +1317,9 @@ output_stored_text(FILE * fp)
     int c;
     FILE *in;
 
-    rewind(text_file);
     if (text_file == NULL)
 	open_error("text_file");
+    rewind(text_file);
     in = text_file;
     if ((c = getc(in)) == EOF)
 	return;
@@ -2078,10 +2094,6 @@ output(void)
 	output_externs(externs_file, global_vars);
 	if (!pure_parser)
 	    output_externs(externs_file, impure_vars);
-    }
-
-    if (iflag)
-    {
 	if (dflag)
 	{
 	    ++outline;
@@ -2111,22 +2123,30 @@ output(void)
     output_actions();
     free_parser();
     output_debug();
+
     if (rflag)
     {
 	write_section(code_file, xdecls);
 	output_YYINT_typedef(code_file);
 	write_section(code_file, tables);
     }
+
     write_section(code_file, global_vars);
     if (!pure_parser)
     {
 	write_section(code_file, impure_vars);
     }
+    output_code_lines(code_file, CODE_REQUIRES);
+
     write_section(code_file, hdr_defs);
     if (!pure_parser)
     {
 	write_section(code_file, hdr_vars);
     }
+
+    output_code_lines(code_file, CODE_PROVIDES);
+    output_code_lines(code_file, CODE_HEADER);
+
     output_trailing_text();
 #if defined(YYBTYACC)
     if (destructor)
diff --git a/external/bsd/byacc/dist/reader.c b/external/bsd/byacc/dist/reader.c
index 49bbae065d78..49a949c7f799 100644
--- a/external/bsd/byacc/dist/reader.c
+++ b/external/bsd/byacc/dist/reader.c
@@ -1,16 +1,16 @@
-/*	$NetBSD: reader.c,v 1.18 2020/05/22 22:59:14 jmcneill Exp $	*/
+/*	$NetBSD: reader.c,v 1.19 2021/02/20 22:57:56 christos Exp $	*/
 
-/* Id: reader.c,v 1.74 2017/12/04 17:50:02 tom Exp  */
+/* Id: reader.c,v 1.84 2020/09/10 20:26:13 tom Exp  */
 
 #include "defs.h"
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: reader.c,v 1.18 2020/05/22 22:59:14 jmcneill Exp $");
+__RCSID("$NetBSD: reader.c,v 1.19 2021/02/20 22:57:56 christos Exp $");
 
 /*  The line size must be a positive integer.  One hundred was chosen	*/
 /*  because few lines in Yacc input grammars exceed 100 characters.	*/
 /*  Note that if a line exceeds LINESIZE characters, the line buffer	*/
-/*  will be expanded to accomodate it.					*/
+/*  will be expanded to accommodate it.					*/
 
 #define LINESIZE 100
 
@@ -67,11 +67,12 @@ char line_format[] = "#line %d \"%s\"\n";
 param *lex_param;
 param *parse_param;
 
-static const char *code_keys[] = {
-	"", "requires", "provides", "top", "imports",
+static const char *code_keys[] =
+{
+    "", "requires", "provides", "top", "imports",
 };
 
-extern struct code_lines code_lines[CODE_MAX];
+struct code_lines code_lines[CODE_MAX];
 
 #if defined(YYBTYACC)
 int destructor = 0;	/* =1 if at least one %destructor */
@@ -189,7 +190,7 @@ line_directive(void)
 	    else
 		UNLESS(!isdigit(UCH(ch)));
 	    line_1st = n;
-	    ld = ldNUM;
+	    ld = ldNUM;		/* this is needed, but cppcheck says no... */
 	    /* FALLTHRU */
 	case ldNUM:
 	    if (isdigit(UCH(ch)))
@@ -265,11 +266,12 @@ static void
 get_line(void)
 {
     FILE *f = input_file;
-    int c;
-    int i;
 
     do
     {
+	int c;
+	int i;
+
 	if (saw_eof || (c = getc(f)) == EOF)
 	{
 	    if (line)
@@ -461,7 +463,7 @@ keywords[] = {
     { "error-verbose",ERROR_VERBOSE },
     { "expect",      EXPECT },
     { "expect-rr",   EXPECT_RR },
-    { "ident",       IDENT }, 
+    { "ident",       IDENT },
 #if defined(YYBTYACC)
     { "initial-action", INITIAL_ACTION },
 #endif
@@ -473,11 +475,11 @@ keywords[] = {
     { "nonassoc",    NONASSOC },
     { "parse-param", PARSE_PARAM },
     { "pure-parser", PURE_PARSER },
-    { "right",       RIGHT }, 
+    { "right",       RIGHT },
     { "start",       START },
     { "term",        TOKEN },
     { "token",       TOKEN },
-    { "token-table", TOKEN_TABLE }, 
+    { "token-table", TOKEN_TABLE },
     { "type",        TYPE },
     { "union",       UNION },
     { "yacc",        POSIX_YACC },
@@ -497,11 +499,12 @@ keyword(void)
 {
     int c;
     char *t_cptr = cptr;
-    struct keyword *key;
 
     c = *++cptr;
     if (isalpha(UCH(c)))
     {
+	struct keyword *key;
+
 	cinc = 0;
 	for (;;)
 	{
@@ -592,7 +595,6 @@ static char *
 copy_string(int quote)
 {
     struct mstring *temp = msnew();
-    int c;
     struct ainfo a;
     a.a_lineno = lineno;
     a.a_line = dup_line();
@@ -600,7 +602,8 @@ copy_string(int quote)
 
     for (;;)
     {
-	c = *cptr++;
+	int c = *cptr++;
+
 	mputc(temp, c);
 	if (c == quote)
 	{
@@ -686,13 +689,13 @@ check_key(int pos)
     return 1;
 }
 
-
 static void
 copy_code(void)
 {
     int c;
     int curl;
-    int cline = 0;
+    int cline;
+    int on_line = 0;
     int pos = CODE_HEADER;
     struct mstring *code_mstr;
 
@@ -724,27 +727,35 @@ copy_code(void)
 	    case 'i':
 		pos = CODE_IMPORTS;
 		break;
-	    default: 
+	    default:
 		break;
 	    }
 
 	    if (pos == -1 || !check_key(pos))
 	    {
 		syntax_error(lineno, line, cptr);
-		return;
+		/*NOTREACHED */
 	    }
 	}
     }
 
-    cptr++;	/* skip initial curl */
+    cptr++;			/* skip initial curl */
     while (*cptr && isspace(UCH(*cptr)))	/* skip space */
 	cptr++;
-    curl = 1;	/* nesting count */
+    curl = 1;			/* nesting count */
 
     /* gather text */
-    code_mstr = msnew();
+    code_lines[pos].name = code_keys[pos];
+    if ((cline = (int)code_lines[pos].num) != 0)
+    {
+	code_mstr = msrenew(code_lines[pos].lines);
+    }
+    else
+    {
+	code_mstr = msnew();
+    }
     cline++;
-    msprintf(code_mstr, "/* %%code %s block start */\n", code_keys[pos]);
+    msprintf(code_mstr, line_format, lineno, input_file_name);
     for (;;)
     {
 	c = *cptr++;
@@ -755,11 +766,12 @@ copy_code(void)
 	    if (line == NULL)
 	    {
 		unexpected_EOF();
-		return;
+		/*NOTREACHED */
 	    }
 	    continue;
 	case '\n':
 	    cline++;
+	    on_line = 0;
 	    break;
 	case L_CURL:
 	    curl++;
@@ -767,11 +779,13 @@ copy_code(void)
 	case R_CURL:
 	    if (--curl == 0)
 	    {
-		cline++;
-		msprintf(code_mstr, "/* %%code %s block end */\n",
-		    code_keys[pos]);
+		if (on_line > 1)
+		{
+		    mputc(code_mstr, '\n');
+		    cline++;
+		}
 		code_lines[pos].lines = msdone(code_mstr);
-		code_lines[pos].num = cline;
+		code_lines[pos].num = (size_t) cline;
 		return;
 	    }
 	    break;
@@ -779,6 +793,7 @@ copy_code(void)
 	    break;
 	}
 	mputc(code_mstr, c);
+	on_line++;
     }
 }
 
@@ -1135,17 +1150,21 @@ copy_param(int k)
 	{
 	    buf_size = (size_t) linesize;
 	    buf = TMALLOC(char, buf_size);
+	    NO_SPACE(buf);
 	}
 	else if (c == '\n')
 	{
+	    char *tmp;
+
 	    get_line();
 	    if (line == NULL)
 		unexpected_EOF();
 	    --cptr;
 	    buf_size += (size_t) linesize;
-	    buf = TREALLOC(char, buf, buf_size);
+	    tmp = TREALLOC(char, buf, buf_size);
+	    NO_SPACE(tmp);
+	    buf = tmp;
 	}
-	NO_SPACE(buf);
 	if (curly)
 	{
 	    if ((state == 2) && (c == L_CURL))
@@ -1196,13 +1215,21 @@ copy_param(int k)
 	if (parms[i] == ']')
 	{
 	    int level = 1;
-	    while (i >= 0 && level > 0 && parms[i] != '[')
+	    while (i >= 0)
 	    {
-		if (parms[i] == ']')
+		char ch = parms[i--];
+		if (ch == ']')
+		{
 		    ++level;
-		else if (parms[i] == '[')
-		    --level;
-		i--;
+		}
+		else if (ch == '[')
+		{
+		    if (--level <= 1)
+		    {
+			++i;
+			break;
+		    }
+		}
 	    }
 	    if (i <= 0)
 		unexpected_EOF();
@@ -1426,8 +1453,6 @@ get_literal(void)
 static int
 is_reserved(char *name)
 {
-    char *s;
-
     if (strcmp(name, ".") == 0 ||
 	strcmp(name, "$accept") == 0 ||
 	strcmp(name, "$end") == 0)
@@ -1435,7 +1460,8 @@ is_reserved(char *name)
 
     if (name[0] == '$' && name[1] == '$' && isdigit(UCH(name[2])))
     {
-	s = name + 3;
+	char *s = name + 3;
+
 	while (isdigit(UCH(*s)))
 	    ++s;
 	if (*s == NUL)
@@ -1683,14 +1709,14 @@ static void
 declare_argtypes(bucket *bp)
 {
     char *tags[MAXARGS];
-    int args = 0, c;
+    int args = 0;
 
     if (bp->args >= 0)
 	retyped_warning(bp->name);
     cptr++;			/* skip open paren */
     for (;;)
     {
-	c = nextc();
+	int c = nextc();
 	if (c == EOF)
 	    unexpected_EOF();
 	if (c != '<')
@@ -1785,15 +1811,15 @@ declare_start(void)
 static void
 read_declarations(void)
 {
-    int c, k;
-
     cache_size = CACHE_SIZE;
     cache = TMALLOC(char, cache_size);
     NO_SPACE(cache);
 
     for (;;)
     {
-	c = nextc();
+	int k;
+	int c = nextc();
+
 	if (c == EOF)
 	    unexpected_EOF();
 	if (c != '%')
@@ -2120,7 +2146,7 @@ compile_arg(char **theptr, char *yyvaltag)
 {
     char *p = *theptr;
     struct mstring *c = msnew();
-    int i, j, n;
+    int i, n;
     Value_t *offsets = NULL, maxoffset;
     bucket **rhs;
 
@@ -2134,6 +2160,8 @@ compile_arg(char **theptr, char *yyvaltag)
     }
     if (maxoffset > 0)
     {
+	int j;
+
 	offsets = TMALLOC(Value_t, maxoffset + 1);
 	NO_SPACE(offsets);
 
@@ -2223,7 +2251,7 @@ can_elide_arg(char **theptr, char *yyvaltag)
 {
     char *p = *theptr;
     int rv = 0;
-    int i, j, n = 0;
+    int i, n = 0;
     Value_t *offsets = NULL, maxoffset = 0;
     bucket **rhs;
     char *tag = 0;
@@ -2243,6 +2271,8 @@ can_elide_arg(char **theptr, char *yyvaltag)
     }
     if (maxoffset > 0)
     {
+	int j;
+
 	offsets = TMALLOC(Value_t, maxoffset + 1);
 	NO_SPACE(offsets);
 
@@ -2276,7 +2306,10 @@ can_elide_arg(char **theptr, char *yyvaltag)
     {
 	char *arg;
 	if (!(p = parse_id(p, &arg)))
+	{
+	    FREE(offsets);
 	    return 0;
+	}
 	for (i = plhs[nrules]->args - 1; i >= 0; i--)
 	    if (arg == plhs[nrules]->argnames[i])
 		break;
@@ -2296,7 +2329,7 @@ can_elide_arg(char **theptr, char *yyvaltag)
 	rv = 0;
     if (maxoffset > 0)
 	FREE(offsets);
-    if (*p || rv <= 0)
+    if (p == 0 || *p || rv <= 0)
 	return 0;
     *theptr = p + 1;
     return rv;
@@ -2360,7 +2393,6 @@ advance_to_start(void)
 {
     int c;
     bucket *bp;
-    char *s_cptr;
     int s_lineno;
 #if defined(YYBTYACC)
     char *args = NULL;
@@ -2369,6 +2401,8 @@ advance_to_start(void)
 
     for (;;)
     {
+	char *s_cptr;
+
 	c = nextc();
 	if (c != '%')
 	    break;
@@ -2447,12 +2481,12 @@ start_rule(bucket *bp, int s_lineno)
 static void
 end_rule(void)
 {
-    int i;
-
     if (!last_was_action && plhs[nrules]->tag)
     {
 	if (pitem[nitems - 1])
 	{
+	    int i;
+
 	    for (i = nitems - 1; (i > 0) && pitem[i]; --i)
 		continue;
 	    if (pitem[i + 1] == 0 || pitem[i + 1]->tag != plhs[nrules]->tag)
@@ -3140,7 +3174,6 @@ static void
 copy_destructor(void)
 {
     char *code_text;
-    int c;
     struct ainfo a;
     bucket *bp;
 
@@ -3148,7 +3181,7 @@ copy_destructor(void)
 
     for (;;)
     {
-	c = nextc();
+	int c = nextc();
 	if (c == EOF)
 	    unexpected_EOF();
 	if (c == '<')
@@ -3352,14 +3385,13 @@ mark_symbol(void)
 static void
 read_grammar(void)
 {
-    int c;
-
     initialize_grammar();
     advance_to_start();
 
     for (;;)
     {
-	c = nextc();
+	int c = nextc();
+
 	if (c == EOF)
 	    break;
 	if (isalpha(UCH(c))
@@ -3416,7 +3448,8 @@ static void
 pack_names(void)
 {
     bucket *bp;
-    char *p, *s, *t;
+    char *p;
+    char *t;
 
     name_pool_size = 13;	/* 13 == sizeof("$end") + sizeof("$accept") */
     for (bp = first_symbol; bp; bp = bp->next)
@@ -3430,8 +3463,9 @@ pack_names(void)
     t = name_pool + 13;
     for (bp = first_symbol; bp; bp = bp->next)
     {
+	char *s = bp->name;
+
 	p = t;
-	s = bp->name;
 	while ((*t++ = *s++) != 0)
 	    continue;
 	FREE(bp->name);
@@ -3460,14 +3494,14 @@ check_symbols(void)
 static void
 protect_string(char *src, char **des)
 {
-    unsigned len;
-    char *s;
-    char *d;
-
     *des = src;
     if (src)
     {
-	len = 1;
+	char *s;
+	char *d;
+
+	unsigned len = 1;
+
 	s = src;
 	while (*s)
 	{
@@ -3678,8 +3712,6 @@ pack_grammar(void)
 {
     int i;
     Value_t j;
-    Assoc_t assoc;
-    Value_t prec2;
 
     ritem = TMALLOC(Value_t, nitems);
     NO_SPACE(ritem);
@@ -3710,6 +3742,9 @@ pack_grammar(void)
     j = 4;
     for (i = 3; i < nrules; ++i)
     {
+	Assoc_t assoc;
+	Value_t prec2;
+
 #if defined(YYBTYACC)
 	if (plhs[i]->args > 0)
 	{
@@ -3801,11 +3836,11 @@ finalize_destructors(void)
 {
     int i;
     bucket *bp;
-    char *tag;
 
     for (i = 2; i < nsyms; ++i)
     {
-	tag = symbol_type_tag[i];
+	char *tag = symbol_type_tag[i];
+
 	if (symbol_destructor[i] == NULL)
 	{
 	    if (tag == NULL)
diff --git a/external/bsd/byacc/dist/test/btyacc/btyacc_calc1.tab.c b/external/bsd/byacc/dist/test/btyacc/btyacc_calc1.tab.c
index f25a6806b9f2..e0b04a835ab8 100644
--- a/external/bsd/byacc/dist/test/btyacc/btyacc_calc1.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/btyacc_calc1.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: btyacc_calc1.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: btyacc_calc1.tab.c,v 1.5 2021/02/20 22:57:56 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/btyacc_demo.tab.c b/external/bsd/byacc/dist/test/btyacc/btyacc_demo.tab.c
index 72c16c3b0d34..bc36a87977fd 100644
--- a/external/bsd/byacc/dist/test/btyacc/btyacc_demo.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/btyacc_demo.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: btyacc_demo.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: btyacc_demo.tab.c,v 1.5 2021/02/20 22:57:56 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/btyacc_demo.tab.h b/external/bsd/byacc/dist/test/btyacc/btyacc_demo.tab.h
index f860bb8bc0a4..3fc908b60575 100644
--- a/external/bsd/byacc/dist/test/btyacc/btyacc_demo.tab.h
+++ b/external/bsd/byacc/dist/test/btyacc/btyacc_demo.tab.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: btyacc_demo.tab.h,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: btyacc_demo.tab.h,v 1.3 2021/02/20 22:57:56 christos Exp $	*/
 
 #ifndef _demo__defines_h_
 #define _demo__defines_h_
@@ -48,5 +48,6 @@ typedef struct YYLTYPE
 #define YYLTYPE_IS_DECLARED 1
 #endif
 #define YYRHSLOC(rhs, k) ((rhs)[k])
+extern YYLTYPE demo_lloc;
 
 #endif /* _demo__defines_h_ */
diff --git a/external/bsd/byacc/dist/test/btyacc/btyacc_destroy1.tab.c b/external/bsd/byacc/dist/test/btyacc/btyacc_destroy1.tab.c
index 5900da09541a..289e5e093517 100644
--- a/external/bsd/byacc/dist/test/btyacc/btyacc_destroy1.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/btyacc_destroy1.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: btyacc_destroy1.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: btyacc_destroy1.tab.c,v 1.5 2021/02/20 22:57:56 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/btyacc_destroy2.tab.c b/external/bsd/byacc/dist/test/btyacc/btyacc_destroy2.tab.c
index 68202bda9329..0ed4e1df14b2 100644
--- a/external/bsd/byacc/dist/test/btyacc/btyacc_destroy2.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/btyacc_destroy2.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: btyacc_destroy2.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: btyacc_destroy2.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/btyacc_destroy3.tab.c b/external/bsd/byacc/dist/test/btyacc/btyacc_destroy3.tab.c
index e9c9a050d5f2..fe0bb532326b 100644
--- a/external/bsd/byacc/dist/test/btyacc/btyacc_destroy3.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/btyacc_destroy3.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: btyacc_destroy3.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: btyacc_destroy3.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/calc.tab.c b/external/bsd/byacc/dist/test/btyacc/calc.tab.c
index 4f88f7a316c3..08f3090b9e4b 100644
--- a/external/bsd/byacc/dist/test/btyacc/calc.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/calc.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: calc.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: calc.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/calc1.tab.c b/external/bsd/byacc/dist/test/btyacc/calc1.tab.c
index bef94ff6e179..1cf419944715 100644
--- a/external/bsd/byacc/dist/test/btyacc/calc1.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/calc1.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: calc1.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: calc1.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/calc2.tab.c b/external/bsd/byacc/dist/test/btyacc/calc2.tab.c
index e0de30a74811..da2af2357bb7 100644
--- a/external/bsd/byacc/dist/test/btyacc/calc2.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/calc2.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: calc2.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: calc2.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/calc3.tab.c b/external/bsd/byacc/dist/test/btyacc/calc3.tab.c
index 8ed0ebecff01..a4234c237edf 100644
--- a/external/bsd/byacc/dist/test/btyacc/calc3.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/calc3.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: calc3.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: calc3.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/code_calc.code.c b/external/bsd/byacc/dist/test/btyacc/code_calc.code.c
index 51affddc1fbb..f8f81d11ec6f 100644
--- a/external/bsd/byacc/dist/test/btyacc/code_calc.code.c
+++ b/external/bsd/byacc/dist/test/btyacc/code_calc.code.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: code_calc.code.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: code_calc.code.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/code_error.code.c b/external/bsd/byacc/dist/test/btyacc/code_error.code.c
index 1c890d127d1e..6ddb84d69827 100644
--- a/external/bsd/byacc/dist/test/btyacc/code_error.code.c
+++ b/external/bsd/byacc/dist/test/btyacc/code_error.code.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: code_error.code.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: code_error.code.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/empty.tab.c b/external/bsd/byacc/dist/test/btyacc/empty.tab.c
index fdf7497974ab..0dc2871535c9 100644
--- a/external/bsd/byacc/dist/test/btyacc/empty.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/empty.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: empty.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: empty.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_inherit1.tab.c b/external/bsd/byacc/dist/test/btyacc/err_inherit1.tab.c
index 2e3f7ce14421..7d62b7d6a542 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_inherit1.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_inherit1.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_inherit1.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_inherit1.tab.c,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_inherit2.tab.c b/external/bsd/byacc/dist/test/btyacc/err_inherit2.tab.c
index 29292753e778..62ea7577a0ae 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_inherit2.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_inherit2.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_inherit2.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_inherit2.tab.c,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_inherit3.tab.c b/external/bsd/byacc/dist/test/btyacc/err_inherit3.tab.c
index 2cf1786af15b..ce70082eb658 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_inherit3.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_inherit3.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_inherit3.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: err_inherit3.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_inherit4.tab.c b/external/bsd/byacc/dist/test/btyacc/err_inherit4.tab.c
index f97d53235dbc..69c702953b81 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_inherit4.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_inherit4.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_inherit4.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: err_inherit4.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_inherit4.tab.h b/external/bsd/byacc/dist/test/btyacc/err_inherit4.tab.h
index 7a159056818c..261eed020562 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_inherit4.tab.h
+++ b/external/bsd/byacc/dist/test/btyacc/err_inherit4.tab.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: err_inherit4.tab.h,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_inherit4.tab.h,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 #ifndef _err_inherit4__defines_h_
 #define _err_inherit4__defines_h_
@@ -37,5 +37,6 @@ typedef struct YYLTYPE
 #define YYLTYPE_IS_DECLARED 1
 #endif
 #define YYRHSLOC(rhs, k) ((rhs)[k])
+extern YYLTYPE err_inherit4_lloc;
 
 #endif /* _err_inherit4__defines_h_ */
diff --git a/external/bsd/byacc/dist/test/btyacc/err_inherit5.tab.c b/external/bsd/byacc/dist/test/btyacc/err_inherit5.tab.c
index c0fdb1d35aa4..2fd41b9c98a1 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_inherit5.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_inherit5.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_inherit5.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_inherit5.tab.c,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax1.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax1.tab.c
index 615034683048..e1f204bc6a2a 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax1.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax1.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax1.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_syntax1.tab.c,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax10.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax10.tab.c
index e86238ae771e..7d29f09c0d93 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax10.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax10.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax10.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: err_syntax10.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax11.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax11.tab.c
index 3a90de5a9d5e..3a61dfa0decd 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax11.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax11.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax11.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: err_syntax11.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax12.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax12.tab.c
index 7a7bd3c54d33..92d4f3e53956 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax12.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax12.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax12.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: err_syntax12.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax13.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax13.tab.c
index 56d233186114..ea88fa477af7 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax13.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax13.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax13.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_syntax13.tab.c,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax14.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax14.tab.c
index 8afcfda874ea..ff1510e57a3c 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax14.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax14.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax14.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_syntax14.tab.c,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax15.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax15.tab.c
index 5c44fa5f8530..a285450bbb2f 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax15.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax15.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax15.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_syntax15.tab.c,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax16.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax16.tab.c
index aff7121ac598..8acfd0952072 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax16.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax16.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax16.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_syntax16.tab.c,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax17.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax17.tab.c
index 813307fc5f72..1f7bebc78e7c 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax17.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax17.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax17.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_syntax17.tab.c,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax18.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax18.tab.c
index 0e2ae77d4d9f..00328eb54885 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax18.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax18.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax18.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: err_syntax18.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax19.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax19.tab.c
index 341e897602a4..f8d2c4fb519b 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax19.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax19.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax19.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_syntax19.tab.c,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax2.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax2.tab.c
index 5beafd18a780..eb271c40e7ae 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax2.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax2.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax2.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_syntax2.tab.c,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax20.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax20.tab.c
index 485f89c21744..4c1e892ff300 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax20.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax20.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax20.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: err_syntax20.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax21.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax21.tab.c
index 03ffa37176f0..794db4bc9e38 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax21.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax21.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax21.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_syntax21.tab.c,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax22.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax22.tab.c
index cc2c0830acf3..d93f591175aa 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax22.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax22.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax22.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_syntax22.tab.c,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax23.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax23.tab.c
index f300bb89343d..1381e87e37e6 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax23.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax23.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax23.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_syntax23.tab.c,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax24.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax24.tab.c
index a4d2dca1c76a..abdd9635b772 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax24.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax24.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax24.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_syntax24.tab.c,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax25.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax25.tab.c
index f838af6285b6..29e58f24e330 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax25.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax25.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax25.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_syntax25.tab.c,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax26.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax26.tab.c
index 4a3b89c93108..8e0f706e304c 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax26.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax26.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax26.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_syntax26.tab.c,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax27.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax27.tab.c
index a293d113c903..de14d29f5776 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax27.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax27.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax27.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_syntax27.tab.c,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax3.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax3.tab.c
index 9b9954fb786d..8efb2f2004a7 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax3.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax3.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax3.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_syntax3.tab.c,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax4.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax4.tab.c
index b9180c9338c7..64de6ee15a6b 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax4.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax4.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax4.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_syntax4.tab.c,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax5.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax5.tab.c
index 39799a93b3b7..107eb717d982 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax5.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax5.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax5.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_syntax5.tab.c,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax6.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax6.tab.c
index 1dd8ebb88e24..263556ad6fbb 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax6.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax6.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax6.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_syntax6.tab.c,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax7.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax7.tab.c
index 4d445fb39f5d..a98e217539cf 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax7.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax7.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax7.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_syntax7.tab.c,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax7a.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax7a.tab.c
index ad845a0703f1..539425dd8e57 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax7a.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax7a.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax7a.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_syntax7a.tab.c,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax7b.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax7b.tab.c
index 700aabc91adf..3fdf4b9536c4 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax7b.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax7b.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax7b.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_syntax7b.tab.c,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax8.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax8.tab.c
index 596b3706545b..9ed6456d50f7 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax8.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax8.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax8.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_syntax8.tab.c,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax8a.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax8a.tab.c
index 713170d4ddd9..6f47d6cb6e21 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax8a.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax8a.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax8a.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_syntax8a.tab.c,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/err_syntax9.tab.c b/external/bsd/byacc/dist/test/btyacc/err_syntax9.tab.c
index 6c6a970faf30..81322ddb1ca4 100644
--- a/external/bsd/byacc/dist/test/btyacc/err_syntax9.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/err_syntax9.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax9.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $	*/
+/*	$NetBSD: err_syntax9.tab.c,v 1.3 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/error.tab.c b/external/bsd/byacc/dist/test/btyacc/error.tab.c
index fc98ae20831a..adc25fd66ec3 100644
--- a/external/bsd/byacc/dist/test/btyacc/error.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/error.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: error.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: error.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/expr.oxout.tab.c b/external/bsd/byacc/dist/test/btyacc/expr.oxout.tab.c
index b4769729888f..067d761d4c60 100644
--- a/external/bsd/byacc/dist/test/btyacc/expr.oxout.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/expr.oxout.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: expr.oxout.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: expr.oxout.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/grammar.tab.c b/external/bsd/byacc/dist/test/btyacc/grammar.tab.c
index d21348e62659..79f92720d4ce 100644
--- a/external/bsd/byacc/dist/test/btyacc/grammar.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/grammar.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: grammar.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: grammar.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
@@ -1195,7 +1195,7 @@ extern char *yytext;
 extern FILE *yyin, *yyout;
 
 static int curly;			/* number of curly brace nesting levels */
-static int ly_count;			/* number of occurances of %% */
+static int ly_count;			/* number of occurrences of %% */
 static int inc_depth;			/* include nesting level */
 static SymbolTable *included_files;	/* files already included */
 static int yy_start = 0;		/* start state number */
diff --git a/external/bsd/byacc/dist/test/btyacc/inherit0.tab.c b/external/bsd/byacc/dist/test/btyacc/inherit0.tab.c
index 92cd470f7238..8780f4af7c5d 100644
--- a/external/bsd/byacc/dist/test/btyacc/inherit0.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/inherit0.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: inherit0.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: inherit0.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/inherit1.tab.c b/external/bsd/byacc/dist/test/btyacc/inherit1.tab.c
index 820ea96e464c..0c5dc6437754 100644
--- a/external/bsd/byacc/dist/test/btyacc/inherit1.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/inherit1.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: inherit1.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: inherit1.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/inherit2.tab.c b/external/bsd/byacc/dist/test/btyacc/inherit2.tab.c
index d0e06ef7ff6a..6fbfb0bb703f 100644
--- a/external/bsd/byacc/dist/test/btyacc/inherit2.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/inherit2.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: inherit2.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: inherit2.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/ok_syntax1.tab.c b/external/bsd/byacc/dist/test/btyacc/ok_syntax1.tab.c
index c55a1019bafa..854676a35d0d 100644
--- a/external/bsd/byacc/dist/test/btyacc/ok_syntax1.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/ok_syntax1.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: ok_syntax1.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: ok_syntax1.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/pure_calc.tab.c b/external/bsd/byacc/dist/test/btyacc/pure_calc.tab.c
index 58a143b1bf20..32423b492664 100644
--- a/external/bsd/byacc/dist/test/btyacc/pure_calc.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/pure_calc.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: pure_calc.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: pure_calc.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/pure_error.tab.c b/external/bsd/byacc/dist/test/btyacc/pure_error.tab.c
index c0dd02e2e782..b9aaf0b74ba2 100644
--- a/external/bsd/byacc/dist/test/btyacc/pure_error.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/pure_error.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: pure_error.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: pure_error.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/quote_calc-s.tab.c b/external/bsd/byacc/dist/test/btyacc/quote_calc-s.tab.c
index 79cc476d8d44..616a80347281 100644
--- a/external/bsd/byacc/dist/test/btyacc/quote_calc-s.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/quote_calc-s.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: quote_calc-s.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: quote_calc-s.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/quote_calc.tab.c b/external/bsd/byacc/dist/test/btyacc/quote_calc.tab.c
index d5b3375933c6..f210c359cf15 100644
--- a/external/bsd/byacc/dist/test/btyacc/quote_calc.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/quote_calc.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: quote_calc.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: quote_calc.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/quote_calc2-s.tab.c b/external/bsd/byacc/dist/test/btyacc/quote_calc2-s.tab.c
index 64d2371ce6c4..e1c63c563e14 100644
--- a/external/bsd/byacc/dist/test/btyacc/quote_calc2-s.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/quote_calc2-s.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: quote_calc2-s.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: quote_calc2-s.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/quote_calc2.tab.c b/external/bsd/byacc/dist/test/btyacc/quote_calc2.tab.c
index dc4c366ac0ef..d38a73b4424a 100644
--- a/external/bsd/byacc/dist/test/btyacc/quote_calc2.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/quote_calc2.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: quote_calc2.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: quote_calc2.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/quote_calc3-s.tab.c b/external/bsd/byacc/dist/test/btyacc/quote_calc3-s.tab.c
index b9afa3107d70..60f45375ab96 100644
--- a/external/bsd/byacc/dist/test/btyacc/quote_calc3-s.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/quote_calc3-s.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: quote_calc3-s.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: quote_calc3-s.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/quote_calc3.tab.c b/external/bsd/byacc/dist/test/btyacc/quote_calc3.tab.c
index bc8051b4472e..0a7540b638aa 100644
--- a/external/bsd/byacc/dist/test/btyacc/quote_calc3.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/quote_calc3.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: quote_calc3.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: quote_calc3.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/quote_calc4-s.tab.c b/external/bsd/byacc/dist/test/btyacc/quote_calc4-s.tab.c
index 0fd7f9dc7aad..9ec9433a6945 100644
--- a/external/bsd/byacc/dist/test/btyacc/quote_calc4-s.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/quote_calc4-s.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: quote_calc4-s.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: quote_calc4-s.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/quote_calc4.tab.c b/external/bsd/byacc/dist/test/btyacc/quote_calc4.tab.c
index 0df590b91ff2..6ba447c61d0d 100644
--- a/external/bsd/byacc/dist/test/btyacc/quote_calc4.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/quote_calc4.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: quote_calc4.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: quote_calc4.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/rename_debug.c b/external/bsd/byacc/dist/test/btyacc/rename_debug.c
index 15075c5c6247..213c73cf16b5 100644
--- a/external/bsd/byacc/dist/test/btyacc/rename_debug.c
+++ b/external/bsd/byacc/dist/test/btyacc/rename_debug.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: rename_debug.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: rename_debug.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/btyacc/varsyntax_calc1.tab.c b/external/bsd/byacc/dist/test/btyacc/varsyntax_calc1.tab.c
index 3f0463558107..b45834b2780b 100644
--- a/external/bsd/byacc/dist/test/btyacc/varsyntax_calc1.tab.c
+++ b/external/bsd/byacc/dist/test/btyacc/varsyntax_calc1.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: varsyntax_calc1.tab.c,v 1.4 2018/12/23 15:38:53 christos Exp $	*/
+/*	$NetBSD: varsyntax_calc1.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/yacc/calc.tab.c b/external/bsd/byacc/dist/test/yacc/calc.tab.c
index 3270e27658fa..cbb01794576e 100644
--- a/external/bsd/byacc/dist/test/yacc/calc.tab.c
+++ b/external/bsd/byacc/dist/test/yacc/calc.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: calc.tab.c,v 1.3 2018/12/23 15:38:54 christos Exp $	*/
+/*	$NetBSD: calc.tab.c,v 1.4 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/yacc/calc1.tab.c b/external/bsd/byacc/dist/test/yacc/calc1.tab.c
index e11c10de83f2..6e2b590734d5 100644
--- a/external/bsd/byacc/dist/test/yacc/calc1.tab.c
+++ b/external/bsd/byacc/dist/test/yacc/calc1.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: calc1.tab.c,v 1.3 2018/12/23 15:38:54 christos Exp $	*/
+/*	$NetBSD: calc1.tab.c,v 1.4 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/yacc/calc2.tab.c b/external/bsd/byacc/dist/test/yacc/calc2.tab.c
index f72a2d5feffe..346a98e3f1bc 100644
--- a/external/bsd/byacc/dist/test/yacc/calc2.tab.c
+++ b/external/bsd/byacc/dist/test/yacc/calc2.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: calc2.tab.c,v 1.3 2018/12/23 15:38:54 christos Exp $	*/
+/*	$NetBSD: calc2.tab.c,v 1.4 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/yacc/calc3.tab.c b/external/bsd/byacc/dist/test/yacc/calc3.tab.c
index 53e07f3f6380..ffd8ead0ffbe 100644
--- a/external/bsd/byacc/dist/test/yacc/calc3.tab.c
+++ b/external/bsd/byacc/dist/test/yacc/calc3.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: calc3.tab.c,v 1.4 2018/12/23 15:38:54 christos Exp $	*/
+/*	$NetBSD: calc3.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/yacc/code_calc.code.c b/external/bsd/byacc/dist/test/yacc/code_calc.code.c
index 19df369feb7d..b4bdd8f0cb6f 100644
--- a/external/bsd/byacc/dist/test/yacc/code_calc.code.c
+++ b/external/bsd/byacc/dist/test/yacc/code_calc.code.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: code_calc.code.c,v 1.3 2018/12/23 15:38:54 christos Exp $	*/
+/*	$NetBSD: code_calc.code.c,v 1.4 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/yacc/code_error.code.c b/external/bsd/byacc/dist/test/yacc/code_error.code.c
index 5deb116098de..a5131b354393 100644
--- a/external/bsd/byacc/dist/test/yacc/code_error.code.c
+++ b/external/bsd/byacc/dist/test/yacc/code_error.code.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: code_error.code.c,v 1.3 2018/12/23 15:38:54 christos Exp $	*/
+/*	$NetBSD: code_error.code.c,v 1.4 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/yacc/empty.tab.c b/external/bsd/byacc/dist/test/yacc/empty.tab.c
index 3eb5f8be084d..0b102eec4b47 100644
--- a/external/bsd/byacc/dist/test/yacc/empty.tab.c
+++ b/external/bsd/byacc/dist/test/yacc/empty.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: empty.tab.c,v 1.3 2018/12/23 15:38:54 christos Exp $	*/
+/*	$NetBSD: empty.tab.c,v 1.4 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/yacc/err_syntax10.tab.c b/external/bsd/byacc/dist/test/yacc/err_syntax10.tab.c
index 705a42edb547..d9366b98d814 100644
--- a/external/bsd/byacc/dist/test/yacc/err_syntax10.tab.c
+++ b/external/bsd/byacc/dist/test/yacc/err_syntax10.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax10.tab.c,v 1.3 2018/12/23 15:38:54 christos Exp $	*/
+/*	$NetBSD: err_syntax10.tab.c,v 1.4 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/yacc/err_syntax11.tab.c b/external/bsd/byacc/dist/test/yacc/err_syntax11.tab.c
index abccaeae0ac2..9b8399620622 100644
--- a/external/bsd/byacc/dist/test/yacc/err_syntax11.tab.c
+++ b/external/bsd/byacc/dist/test/yacc/err_syntax11.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax11.tab.c,v 1.3 2018/12/23 15:38:54 christos Exp $	*/
+/*	$NetBSD: err_syntax11.tab.c,v 1.4 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/yacc/err_syntax12.tab.c b/external/bsd/byacc/dist/test/yacc/err_syntax12.tab.c
index 2c817a047c2e..2afb3a033f9d 100644
--- a/external/bsd/byacc/dist/test/yacc/err_syntax12.tab.c
+++ b/external/bsd/byacc/dist/test/yacc/err_syntax12.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax12.tab.c,v 1.3 2018/12/23 15:38:54 christos Exp $	*/
+/*	$NetBSD: err_syntax12.tab.c,v 1.4 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/yacc/err_syntax18.tab.c b/external/bsd/byacc/dist/test/yacc/err_syntax18.tab.c
index e07c26db90dd..0d46b145765d 100644
--- a/external/bsd/byacc/dist/test/yacc/err_syntax18.tab.c
+++ b/external/bsd/byacc/dist/test/yacc/err_syntax18.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax18.tab.c,v 1.3 2018/12/23 15:38:54 christos Exp $	*/
+/*	$NetBSD: err_syntax18.tab.c,v 1.4 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/yacc/err_syntax20.tab.c b/external/bsd/byacc/dist/test/yacc/err_syntax20.tab.c
index 86c1882eb883..e3cd1304c8d2 100644
--- a/external/bsd/byacc/dist/test/yacc/err_syntax20.tab.c
+++ b/external/bsd/byacc/dist/test/yacc/err_syntax20.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: err_syntax20.tab.c,v 1.3 2018/12/23 15:38:54 christos Exp $	*/
+/*	$NetBSD: err_syntax20.tab.c,v 1.4 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/yacc/error.tab.c b/external/bsd/byacc/dist/test/yacc/error.tab.c
index 9b081d55460a..6560fae3729c 100644
--- a/external/bsd/byacc/dist/test/yacc/error.tab.c
+++ b/external/bsd/byacc/dist/test/yacc/error.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: error.tab.c,v 1.3 2018/12/23 15:38:54 christos Exp $	*/
+/*	$NetBSD: error.tab.c,v 1.4 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/yacc/expr.oxout.tab.c b/external/bsd/byacc/dist/test/yacc/expr.oxout.tab.c
index 2f32f140ddf3..cc2109a4d5f4 100644
--- a/external/bsd/byacc/dist/test/yacc/expr.oxout.tab.c
+++ b/external/bsd/byacc/dist/test/yacc/expr.oxout.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: expr.oxout.tab.c,v 1.3 2018/12/23 15:38:54 christos Exp $	*/
+/*	$NetBSD: expr.oxout.tab.c,v 1.4 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/yacc/grammar.tab.c b/external/bsd/byacc/dist/test/yacc/grammar.tab.c
index 20acdb389fe1..b3ed51fdb852 100644
--- a/external/bsd/byacc/dist/test/yacc/grammar.tab.c
+++ b/external/bsd/byacc/dist/test/yacc/grammar.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: grammar.tab.c,v 1.3 2018/12/23 15:38:54 christos Exp $	*/
+/*	$NetBSD: grammar.tab.c,v 1.4 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
@@ -939,7 +939,7 @@ extern char *yytext;
 extern FILE *yyin, *yyout;
 
 static int curly;			/* number of curly brace nesting levels */
-static int ly_count;			/* number of occurances of %% */
+static int ly_count;			/* number of occurrences of %% */
 static int inc_depth;			/* include nesting level */
 static SymbolTable *included_files;	/* files already included */
 static int yy_start = 0;		/* start state number */
diff --git a/external/bsd/byacc/dist/test/yacc/ok_syntax1.tab.c b/external/bsd/byacc/dist/test/yacc/ok_syntax1.tab.c
index f11676ed6d1a..792dae5d4389 100644
--- a/external/bsd/byacc/dist/test/yacc/ok_syntax1.tab.c
+++ b/external/bsd/byacc/dist/test/yacc/ok_syntax1.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: ok_syntax1.tab.c,v 1.4 2018/12/23 15:38:54 christos Exp $	*/
+/*	$NetBSD: ok_syntax1.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/yacc/pure_calc.tab.c b/external/bsd/byacc/dist/test/yacc/pure_calc.tab.c
index 946cb8e2042b..d9e4a0014d59 100644
--- a/external/bsd/byacc/dist/test/yacc/pure_calc.tab.c
+++ b/external/bsd/byacc/dist/test/yacc/pure_calc.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: pure_calc.tab.c,v 1.4 2018/12/23 15:38:54 christos Exp $	*/
+/*	$NetBSD: pure_calc.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/yacc/pure_error.tab.c b/external/bsd/byacc/dist/test/yacc/pure_error.tab.c
index bde7093314a5..18677f268275 100644
--- a/external/bsd/byacc/dist/test/yacc/pure_error.tab.c
+++ b/external/bsd/byacc/dist/test/yacc/pure_error.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: pure_error.tab.c,v 1.4 2018/12/23 15:38:54 christos Exp $	*/
+/*	$NetBSD: pure_error.tab.c,v 1.5 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/yacc/quote_calc-s.tab.c b/external/bsd/byacc/dist/test/yacc/quote_calc-s.tab.c
index 1cd2507ec1e8..bd45a91c0924 100644
--- a/external/bsd/byacc/dist/test/yacc/quote_calc-s.tab.c
+++ b/external/bsd/byacc/dist/test/yacc/quote_calc-s.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: quote_calc-s.tab.c,v 1.3 2018/12/23 15:38:54 christos Exp $	*/
+/*	$NetBSD: quote_calc-s.tab.c,v 1.4 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/yacc/quote_calc.tab.c b/external/bsd/byacc/dist/test/yacc/quote_calc.tab.c
index 944ab9975782..29f6cfef0e4d 100644
--- a/external/bsd/byacc/dist/test/yacc/quote_calc.tab.c
+++ b/external/bsd/byacc/dist/test/yacc/quote_calc.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: quote_calc.tab.c,v 1.3 2018/12/23 15:38:54 christos Exp $	*/
+/*	$NetBSD: quote_calc.tab.c,v 1.4 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/yacc/quote_calc2-s.tab.c b/external/bsd/byacc/dist/test/yacc/quote_calc2-s.tab.c
index cf8bd9f06b6b..f159762a5325 100644
--- a/external/bsd/byacc/dist/test/yacc/quote_calc2-s.tab.c
+++ b/external/bsd/byacc/dist/test/yacc/quote_calc2-s.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: quote_calc2-s.tab.c,v 1.3 2018/12/23 15:38:54 christos Exp $	*/
+/*	$NetBSD: quote_calc2-s.tab.c,v 1.4 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/yacc/quote_calc2.tab.c b/external/bsd/byacc/dist/test/yacc/quote_calc2.tab.c
index 5ea6e64c3c71..0356458b321f 100644
--- a/external/bsd/byacc/dist/test/yacc/quote_calc2.tab.c
+++ b/external/bsd/byacc/dist/test/yacc/quote_calc2.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: quote_calc2.tab.c,v 1.3 2018/12/23 15:38:54 christos Exp $	*/
+/*	$NetBSD: quote_calc2.tab.c,v 1.4 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/yacc/quote_calc3-s.tab.c b/external/bsd/byacc/dist/test/yacc/quote_calc3-s.tab.c
index e89295c8346a..b7335361ed4a 100644
--- a/external/bsd/byacc/dist/test/yacc/quote_calc3-s.tab.c
+++ b/external/bsd/byacc/dist/test/yacc/quote_calc3-s.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: quote_calc3-s.tab.c,v 1.3 2018/12/23 15:38:54 christos Exp $	*/
+/*	$NetBSD: quote_calc3-s.tab.c,v 1.4 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/yacc/quote_calc3.tab.c b/external/bsd/byacc/dist/test/yacc/quote_calc3.tab.c
index 6f3e7219a085..79395d83d1b1 100644
--- a/external/bsd/byacc/dist/test/yacc/quote_calc3.tab.c
+++ b/external/bsd/byacc/dist/test/yacc/quote_calc3.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: quote_calc3.tab.c,v 1.3 2018/12/23 15:38:54 christos Exp $	*/
+/*	$NetBSD: quote_calc3.tab.c,v 1.4 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/yacc/quote_calc4-s.tab.c b/external/bsd/byacc/dist/test/yacc/quote_calc4-s.tab.c
index 690002b1b1cb..0f54cddf3fbe 100644
--- a/external/bsd/byacc/dist/test/yacc/quote_calc4-s.tab.c
+++ b/external/bsd/byacc/dist/test/yacc/quote_calc4-s.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: quote_calc4-s.tab.c,v 1.3 2018/12/23 15:38:54 christos Exp $	*/
+/*	$NetBSD: quote_calc4-s.tab.c,v 1.4 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/yacc/quote_calc4.tab.c b/external/bsd/byacc/dist/test/yacc/quote_calc4.tab.c
index 0030a1fdaec9..904c1064edfc 100644
--- a/external/bsd/byacc/dist/test/yacc/quote_calc4.tab.c
+++ b/external/bsd/byacc/dist/test/yacc/quote_calc4.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: quote_calc4.tab.c,v 1.3 2018/12/23 15:38:54 christos Exp $	*/
+/*	$NetBSD: quote_calc4.tab.c,v 1.4 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/yacc/rename_debug.c b/external/bsd/byacc/dist/test/yacc/rename_debug.c
index fc98555b2164..2e2b85f9165f 100644
--- a/external/bsd/byacc/dist/test/yacc/rename_debug.c
+++ b/external/bsd/byacc/dist/test/yacc/rename_debug.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: rename_debug.c,v 1.3 2018/12/23 15:38:54 christos Exp $	*/
+/*	$NetBSD: rename_debug.c,v 1.4 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/test/yacc/varsyntax_calc1.tab.c b/external/bsd/byacc/dist/test/yacc/varsyntax_calc1.tab.c
index 5617cd32433f..08192cf29380 100644
--- a/external/bsd/byacc/dist/test/yacc/varsyntax_calc1.tab.c
+++ b/external/bsd/byacc/dist/test/yacc/varsyntax_calc1.tab.c
@@ -1,12 +1,12 @@
-/*	$NetBSD: varsyntax_calc1.tab.c,v 1.3 2018/12/23 15:38:54 christos Exp $	*/
+/*	$NetBSD: varsyntax_calc1.tab.c,v 1.4 2021/02/20 22:57:57 christos Exp $	*/
 
 /* original parser id follows */
 /* yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93" */
 /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
 
 #define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
+#define YYMAJOR 2
+#define YYMINOR 0
 #define YYCHECK "yyyymmdd"
 
 #define YYEMPTY        (-1)
diff --git a/external/bsd/byacc/dist/verbose.c b/external/bsd/byacc/dist/verbose.c
index baf8ab785a88..15420850f080 100644
--- a/external/bsd/byacc/dist/verbose.c
+++ b/external/bsd/byacc/dist/verbose.c
@@ -1,11 +1,11 @@
-/*	$NetBSD: verbose.c,v 1.12 2018/12/23 20:27:23 jakllsch Exp $	*/
+/*	$NetBSD: verbose.c,v 1.13 2021/02/20 22:57:56 christos Exp $	*/
 
-/* Id: verbose.c,v 1.12 2016/06/07 00:22:05 tom Exp  */
+/* Id: verbose.c,v 1.13 2020/09/10 17:57:34 tom Exp  */
 
 #include "defs.h"
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: verbose.c,v 1.12 2018/12/23 20:27:23 jakllsch Exp $");
+__RCSID("$NetBSD: verbose.c,v 1.13 2021/02/20 22:57:56 christos Exp $");
 
 static void log_conflicts(void);
 static void log_unused(void);
@@ -177,18 +177,14 @@ static void
 print_core(int state)
 {
     int i;
-    int k;
-    int rule;
-    core *statep;
-    Value_t *sp;
-    Value_t *sp1;
-
-    statep = state_table[state];
-    k = statep->nitems;
+    core *statep = state_table[state];
+    int k = statep->nitems;
 
     for (i = 0; i < k; i++)
     {
-	sp1 = sp = ritem + statep->items[i];
+	int rule;
+	Value_t *sp = ritem + statep->items[i];
+	Value_t *sp1 = sp;
 
 	while (*sp >= 0)
 	    ++sp;
@@ -257,7 +253,6 @@ print_actions(int stateno)
 {
     action *p;
     shifts *sp;
-    int as;
 
     if (stateno == final_state)
 	fprintf(verbose_file, "\t$end  accept\n");
@@ -272,7 +267,8 @@ print_actions(int stateno)
     sp = shift_table[stateno];
     if (sp && sp->nshifts > 0)
     {
-	as = accessing_symbol[sp->shift[sp->nshifts - 1]];
+	int as = accessing_symbol[sp->shift[sp->nshifts - 1]];
+
 	if (ISVAR(as))
 	    print_gotos(stateno);
     }
@@ -310,7 +306,7 @@ print_shifts(action *p)
 static void
 print_reductions(action *p, int defred2)
 {
-    int k, anyreds;
+    int anyreds;
     action *q;
 
     anyreds = 0;
@@ -331,7 +327,8 @@ print_reductions(action *p, int defred2)
 	{
 	    if (p->action_code == REDUCE && p->number != defred2)
 	    {
-		k = p->number - 2;
+		int k = p->number - 2;
+
 		if (p->suppressed == 0)
 		    fprintf(verbose_file, "\t%s  reduce %d\n",
 			    symbol_name[p->symbol], k);
@@ -351,8 +348,7 @@ print_reductions(action *p, int defred2)
 static void
 print_gotos(int stateno)
 {
-    int i, k;
-    int as;
+    int i;
     Value_t *to_state2;
     shifts *sp;
 
@@ -361,8 +357,9 @@ print_gotos(int stateno)
     to_state2 = sp->shift;
     for (i = 0; i < sp->nshifts; ++i)
     {
-	k = to_state2[i];
-	as = accessing_symbol[k];
+	int k = to_state2[i];
+	int as = accessing_symbol[k];
+
 	if (ISVAR(as))
 	    fprintf(verbose_file, "\t%s  goto %d\n", symbol_name[as], k);
     }
diff --git a/external/bsd/byacc/dist/warshall.c b/external/bsd/byacc/dist/warshall.c
index 5f31dc2bdf3d..48200b48960b 100644
--- a/external/bsd/byacc/dist/warshall.c
+++ b/external/bsd/byacc/dist/warshall.c
@@ -1,11 +1,11 @@
-/*	$NetBSD: warshall.c,v 1.10 2018/12/23 20:27:23 jakllsch Exp $	*/
+/*	$NetBSD: warshall.c,v 1.11 2021/02/20 22:57:56 christos Exp $	*/
 
-/* Id: warshall.c,v 1.7 2010/06/06 22:48:51 tom Exp  */
+/* Id: warshall.c,v 1.9 2020/09/22 20:17:00 tom Exp  */
 
 #include "defs.h"
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: warshall.c,v 1.10 2018/12/23 20:27:23 jakllsch Exp $");
+__RCSID("$NetBSD: warshall.c,v 1.11 2021/02/20 22:57:56 christos Exp $");
 
 static void
 transitive_closure(unsigned *R, int n)
@@ -15,7 +15,6 @@ transitive_closure(unsigned *R, int n)
     unsigned *rowj;
     unsigned *rp;
     unsigned *rend;
-    unsigned *ccol;
     unsigned *relend;
     unsigned *cword;
     unsigned *rowi;
@@ -28,12 +27,13 @@ transitive_closure(unsigned *R, int n)
     rowi = R;
     while (rowi < relend)
     {
-	ccol = cword;
+	unsigned *ccol = cword;
+
 	rowj = R;
 
 	while (rowj < relend)
 	{
-	    if (*ccol & (unsigned)(1 << i))
+	    if (*ccol & (1U << i))
 	    {
 		rp = rowi;
 		rend = rowj + rowsize;
@@ -75,7 +75,7 @@ reflexive_transitive_closure(unsigned *R, int n)
     rp = R;
     while (rp < relend)
     {
-	*rp |= (unsigned)(1 << i);
+	*rp |= (1U << i);
 	if (++i >= BITS_PER_WORD)
 	{
 	    i = 0;
diff --git a/external/bsd/byacc/dist/yacc.1 b/external/bsd/byacc/dist/yacc.1
index fc1e513fb689..fe94c7131a89 100644
--- a/external/bsd/byacc/dist/yacc.1
+++ b/external/bsd/byacc/dist/yacc.1
@@ -1,6 +1,6 @@
-.\"	$NetBSD: yacc.1,v 1.9 2019/10/06 23:29:42 christos Exp $
+.\"	$NetBSD: yacc.1,v 1.10 2021/02/20 22:57:56 christos Exp $
 .\"
-.\" Id: yacc.1,v 1.29 2019/06/16 19:58:03 tom Exp 
+.\" Id: yacc.1,v 1.35 2020/09/10 19:30:12 tom Exp 
 .\"
 .\" .TH YACC 1 "July\ 15,\ 1990"
 .\" .UC 6
@@ -29,11 +29,11 @@
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
 ..
-.TH YACC 1 "June 16, 2019" "Berkeley Yacc" "User Commands"
+.TH YACC 1 "September 10, 2020" "Berkeley Yacc" "User Commands"
 .SH NAME
 \*N \- an LALR(1) parser generator
 .SH SYNOPSIS
-.B \*n [ -BdgilLPrtvVy ] [ \-b
+.B \*n [ \-BdgilLPrtvVy ] [ \-b
 .I file_prefix
 .B ] [ \-H
 .I defines_file
@@ -52,7 +52,7 @@ The parsers consist of a set of LALR(1) parsing tables and a driver routine
 written in the C programming language.
 .B \*N
 normally writes the parse tables and the driver routine to the file
-.I y.tab.c.
+.IR  y.tab.c .
 .PP
 The following options are available:
 .TP 5
@@ -85,15 +85,16 @@ The
 option causes a graphical description of the generated LALR(1) parser to
 be written to the file
 .B y.dot
-in graphviz format, ready to be processed by dot(1).
+in graphviz format, ready to be processed by
+.BR dot (1).
 .TP
 .B \-i
-The \fB-i\fR option causes a supplementary header file
+The \fB\-i\fR option causes a supplementary header file
 .B y.tab.i
 to be written.
 It contains extern declarations
 and supplementary #define's as needed to map the conventional \fIyacc\fP
-\fByy\fP-prefixed names to whatever the \fB-p\fP option may specify.
+\fByy\fP-prefixed names to whatever the \fB\-p\fP option may specify.
 The code file, e.g., \fBy.tab.c\fP is modified to #include this file
 as well as the \fBy.tab.h\fP file, enforcing consistent usage of the
 symbols defined in those files.
@@ -109,7 +110,7 @@ option is not specified,
 will insert \fI#line\fP directives in the generated code.
 The \fI#line\fP directives let the C compiler relate errors in the
 generated code to the user's original code.
-If the \fB-l\fR option is specified,
+If the \fB\-l\fR option is specified,
 .B \*n
 will not insert the \fI#line\fP directives.
 \&\fI#line\fP directives specified by the user will be retained.
@@ -122,7 +123,7 @@ e.g., \*(``%locations\*('' (compile-time configuration for \fBbtyacc\fP).
 specify the filename for the parser file.
 If this option is not given, the output filename is
 the file prefix concatenated with the file suffix, e.g., \fBy.tab.c\fP.
-This overrides the \fB-b\fP option.
+This overrides the \fB\-b\fP option.
 .TP
 \fB\-p \fP\fIsymbol_prefix\fR
 The
@@ -134,7 +135,7 @@ The default prefix is the string
 .B yy.
 .TP
 .B \-P
-create a reentrant parser, e.g., \*(``%pure-parser\*(''.
+create a reentrant parser, e.g., \*(``%pure\-parser\*(''.
 .TP
 .B \-r
 The
@@ -143,9 +144,9 @@ option causes
 .B \*n
 to produce separate files for code and tables.
 The code file is named
-.I y.code.c,
+.IR y.code.c ,
 and the tables file is named
-.I y.tab.c.
+.IR y.tab.c .
 The prefix \*(``\fIy.\fP\*('' can be overridden using the \fB\-b\fP option.
 .TP
 .B \-s
@@ -206,10 +207,35 @@ A single \fIfilename\fP parameter is expected after a \*(``\-\-\*('' marker.
 provides some extensions for
 compatibility with bison and other implementations of yacc.
 The \fB%destructor\fP and \fB%locations\fP features are available
-only if \fByacc\fP has been configured and compiled to support the
+only if \fB\*n\fP has been configured and compiled to support the
 back-tracking (\fBbtyacc\fP) functionality.
 The remaining features are always available:
 .TP
+\fB %code\fP \fIkeyword\fP { \fIcode\fP }
+Adds the indicated source \fIcode\fP at a given point in the output file.
+The optional \fIkeyword\fP tells \fB\*n\fP where to insert the \fIcode\fP:
+.RS 7
+.TP 5
+\fBtop\fP
+just after the version-definition in the generated code-file.
+.TP 5
+\fBrequires\fP
+just after the declaration of public parser variables.
+If the \fB\-d\fP option is given, the code is inserted at the
+beginning of the defines-file.
+.TP 5
+\fBprovides\fP
+just after the declaration of private parser variables.
+If the \fB\-d\fP option is given, the code is inserted at the
+end of the defines-file.
+.RE
+.IP
+If no \fIkeyword\fP is given, the code is inserted at the
+beginning of the section of code copied verbatim from the source file.
+Multiple \fB%code\fP directives may be given;
+\fB\*n\fP inserts those into the corresponding code- or defines-file
+in the order that they appear in the source file.
+.TP
 \fB %destructor\fP { \fIcode\fP } \fIsymbol+\fP
 defines code that is invoked when a symbol is automatically
 discarded during error recovery.
@@ -229,11 +255,11 @@ The bracketed \fIcode\fP is invoked whenever the parser discards one of
 the symbols.
 Within \fIcode\fP, \*(``\fB$$\fP\*('' or
 \*(``\fB$<tag>$\fP\*('' designates the semantic value associated with the
-discarded symbol, and  \*(``\fB@$\fP\*('' designates its location (see
+discarded symbol, and \*(``\fB@$\fP\*('' designates its location (see
 \fB%locations\fP directive).
 .IP
 A per-symbol destructor is defined by listing a grammar symbol
-in \fIsymbol+\fP.  A per-type destructor is defined  by listing
+in \fIsymbol+\fP.  A per-type destructor is defined by listing
 a semantic type tag (e.g., \*(``<some_tag>\*('') in \fIsymbol+\fP; in this
 case, the parser will invoke \fIcode\fP whenever it discards any grammar
 symbol that has that semantic type tag, unless that symbol has its own
@@ -256,13 +282,13 @@ for grammar symbols that have no declared semantic type tag.
 tells \fByacc\fP the expected number of shift/reduce conflicts.
 That makes it only report the number if it differs.
 .TP
-\fB %expect-rr\fP \fInumber\fP
+\fB %expect\-rr\fP \fInumber\fP
 tell \fByacc\fP the expected number of reduce/reduce conflicts.
 That makes it only report the number if it differs.
 This is (unlike bison) allowable in LALR parsers.
 .TP
 \fB %locations\fP
-tells \fByacc\fP to enable  management of position information associated
+tells \fByacc\fP to enable management of position information associated
 with each token, provided by the lexer in the global variable \fByylloc\fP,
 similar to management of semantic value information provided in \fByylval\fP.
 .IP
@@ -296,23 +322,23 @@ the rule, before the associated action is executed; this macro can be
 redefined by the user.
 .IP
 This directive adds a \fBYYLTYPE\fP parameter to \fByyerror()\fP.
-If the \fB%pure-parser\fP directive is present,
+If the \fB%pure\-parser\fP directive is present,
 a \fBYYLTYPE\fP parameter is added to \fByylex()\fP calls.
 .TP
-\fB %lex-param\fP { \fIargument-declaration\fP }
+\fB %lex\-param\fP { \fIargument-declaration\fP }
 By default, the lexer accepts no parameters, e.g., \fByylex()\fP.
 Use this directive to add parameter declarations for your customized lexer.
 .TP
-\fB %parse-param\fP { \fIargument-declaration\fP }
+\fB %parse\-param\fP { \fIargument-declaration\fP }
 By default, the parser accepts no parameters, e.g., \fByyparse()\fP.
 Use this directive to add parameter declarations for your customized parser.
 .TP
-\fB %pure-parser\fP
+\fB %pure\-parser\fP
 Most variables (other than \fByydebug\fP and \fByynerrs\fP) are
 allocated on the stack within \fByyparse\fP, making the parser reasonably
 reentrant.
 .TP
-\fB %token-table\fP
+\fB %token\-table\fP
 Make the parser's names for tokens available in the \fByytname\fP array.
 However,
 .B \*n
@@ -322,7 +348,7 @@ or \*(``$undefined\*('' in this array.
 According to Robert Corbett,
 .Ex
 Berkeley Yacc is an LALR(1) parser generator.  Berkeley Yacc
-has been made as compatible as possible with AT&T Yacc. 
+has been made as compatible as possible with AT&T Yacc.
 Berkeley Yacc can accept any input specification that
 conforms to the AT&T Yacc documentation.  Specifications
 that take advantage of undocumented features of AT&T Yacc
@@ -358,14 +384,14 @@ yyerror without providing prototypes.
 Bison's support for \*(``%expect\*('' is broken in more than one release.
 For best results using bison, delete that directive.
 .bP
-Bison has no equivalent for some of \fByacc\fP's commmand-line options,
+Bison has no equivalent for some of \fByacc\fP's command-line options,
 relying on directives embedded in the grammar file.
 .bP
 Bison's \*(``\fB\-y\fP\*('' option does not affect bison's lack of support for
 features of AT&T yacc which were deemed obsolescent.
 .bP
 \fBYacc\fP accepts multiple parameters
-with \fB%lex-param\fP and \fB%parse-param\fP in two forms
+with \fB%lex\-param\fP and \fB%parse\-param\fP in two forms
 .Ex
 {type1 name1} {type2 name2} ...
 {type1 name1,  type2 name2 ...}
@@ -374,7 +400,7 @@ with \fB%lex-param\fP and \fB%parse-param\fP in two forms
 Bison accepts the latter (though undocumented), but depending on the
 release may generate bad code.
 .bP
-Like bison, \fByacc\fP will add parameters specified via \fB%parse-param\fP
+Like bison, \fByacc\fP will add parameters specified via \fB%parse\-param\fP
 to \fByyparse\fP, \fByyerror\fP and (if configured for back-tracking)
 to the destructor declared using \fB%destructor\fP.
 Bison puts the additional parameters \fIfirst\fP for