Merge branch 'gawk-5.1-stable'

22 files changed, 502 insertions, 501 deletions

diff --git a/ChangeLog b/ChangeLog
index 36b37c35..927144e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2021-10-13         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* README: Update version, copyright year.
+	* custom.h: Update copyright year.
+
 2021-09-26         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* builtin.c (do_mktime): Update that ISO 8601 does not allow
@@ -78,7 +83,7 @@
 	* builtin.c (do_sub): Rationalize handling of strongly typed
 	regex as argument to sub/gsub, as well as rationalize the return
 	value from gensub to always be string. Thanks to John Naman
-	<jnaman2@gmail.com> for the bug report.
+	<gawker@703n.com> for the bug report.
 
 2021-08-05         Andrew J. Schorr      <aschorr@telemetry-investments.com>
 
@@ -119,8 +124,6 @@
 	int for proper int vs. unsigned comparison. Fixes things
 	for HP-UX. Thanks to Daniel Richard G. for the report.
 
-2021-06-04         Arnold D. Robbins     <arnold@skeeve.com>
-
 2021-05-21         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* debug.c: For z/OS, use %#p to print pointers, %p everything else.
@@ -186,7 +189,7 @@
 
 2021-04-16         Arnold D. Robbins     <arnold@skeeve.com>
 
-	* main (arg_assign): For -v '@/...' make sure that there are
+	* main.c (arg_assign): For -v '@/...' make sure that there are
 	at least three characters there. Thanks to Ed Morton
 	<mortoneccc@comcast.net> for the report.
 
@@ -913,7 +916,7 @@
 	* array.c (sort_up_value_type): Handle other types of nodes,
 	in case someone applies PROCINFO["sorted_in"] to SYMTAB or
 	FUNCTAB. This threw an assertion error if assertions were
-	enabled. Thanks to John Namam <Gawer@703n.com> for the report.
+	enabled. Thanks to John Namam <gawker@703n.com> for the report.
 	(asort_actual): Disallow SYMTAB and FUNCTAB as first arguments.
 	* TODO: Note that we should should eventually allow SYMTAB/FUNCTAB
 	passed to asort/asorti if a destination array is provided. (The
diff --git a/Checklist b/Checklist
index d9c6fb97..badb9e50 100644
--- a/Checklist
+++ b/Checklist
@@ -1,60 +1,65 @@
-Tue Jul 23 05:56:35 IDT 2019
+Wed Oct 13 16:23:51 IDT 2021
 ============================
 
-A checklist for making releases
+A checklist for making releases.
 
-Latest config.guess and config.sub from Gnulib.
-The regtest test and other non-standard tests all pass
-Copyright dates in all files updated
-	main.c - copyright message too!
-ChangeLogs in place and updated
-README updated
-README_d/* edited
-VMS/* version stuff up to date
-	vms/vmsbuild.com
-	vms/descrip.mms
-NEWS is up to date
-Any new options have been added to usage function
-All paper work signed and sent in
-All files checked in
-Version information is correct in
-	doc/gawk.1
-	doc/awkcard.in
-	doc/gawktexi.in
-	doc/gawkinet.texi
-	extension/configure.ac
-doc/texinfo.tex is up to date
-doc/gawktexi.in is up to date
-doc/gawkinet.texi is up to date
-doc/gawk.1 is up to date
-doc/awkcard.in is up to date
-Italian translations are up to date:
-	doc/it/gawktexi.in
-	doc/it/gawk.1
-	po/it.po
-Run prepinfo on the manual.
-Spell check the manual.
-Update the wordlist for spell checking.
-test/Makefile.am: order and prettify lists of tests
-API Version numbers have been modified correctly in gawkapi.h.
+___ Latest config.guess and config.sub from Gnulib.
+___ The regtest test and other non-standard tests all pass
+___ Copyright dates in all files updated
+___ main.c - copyright message too!
+___ ChangeLogs in place and updated
+___ README updated
+___ README_d/* edited
+___ VMS/* version stuff up to date
+	___ vms/vmsbuild.com
+	___ vms/descrip.mms
+___ NEWS is up to date
+___ Any new options have been added to usage function
+___ All paper work signed and sent in
+___ All files checked in
+___ Version information is correct in
+	___ configure.ac
+	___ doc/gawk.1
+	___ doc/awkcard.in
+	___ doc/gawktexi.in
+	___ doc/gawkinet.texi
+	___ extension/configure.ac
+___ doc/texinfo.tex is up to date
+___ doc/gawktexi.in is up to date
+___ doc/gawkinet.texi is up to date
+___ doc/gawkworkflow.texi is up to date
+___ doc/gawk.1 is up to date
+___ doc/awkcard.in is up to date
+___ Italian translations are up to date:
+	___ doc/it/gawktexi.in
+	___ doc/it/gawk.1
+	___ po/it.po
+___ Run prepinfo on the manual.
+___ Spell check the documentation files.
+___ Update the wordlists for spell checking.
+___ test/Makefile.am: order and prettify lists of tests
+___ API Version numbers have been modified correctly in gawkapi.h.
 
-Testing on
-	make clean
-	make distclean
-	make maintainer-clean
-	make release
+___ Testing on:
+	___ make clean
+	___ make distclean
+	___ make maintainer-clean
+	___ make release
 
-	compile with tcc
-	compile with pcc
-	compile with clang
+	___ make valgrind
 
-	compile 32 bit tests - clang and gcc
+	___ compile with tcc
+	___ compile with pcc
+	___ compile with clang
+	___ compile with latest releaese gcc
 
-	configure --disable-lint
-	configure --disable-nls
+	___ compile 32 bit tests - clang and gcc
 
-	building in a different directory from the source
-	building doc in a different directory from the source
+	___ configure --disable-lint
+	___ configure --disable-nls
+
+	___ building in a different directory from the source
+	___ building doc in a different directory from the source
 
 The simplest way of making sure that no PO file is forgotten, is to 
 run the following command just before rolling a new release:
diff --git a/README b/README
index 64152ae1..62d65282 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
   Copyright (C) 2005, 2006, 2007, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-  2016, 2017, 2018, 2019, 2020 Free Software Foundation, Inc.
+  2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
   
   Copying and distribution of this file, with or without modification,
   are permitted in any medium without royalty provided the copyright
@@ -7,11 +7,11 @@
 
 README:
 
-This is GNU Awk 5.1.0. It is upwardly compatible with Brian Kernighan's
+This is GNU Awk 5.1.1. It is upwardly compatible with Brian Kernighan's
 version of Unix awk.  It is almost completely compliant with the
 2018 POSIX 1003.1 standard for awk. (See the note below about POSIX.)
 
-This is a major release. See NEWS and ChangeLog for details.
+This is a bug-fix release. See NEWS and ChangeLog for details.
 
 Work to be done is described briefly in the TODO file, which is available
 only in the 'master' branch in the Git repo.
diff --git a/README_d/ChangeLog b/README_d/ChangeLog
index 9e91d230..6076258f 100644
--- a/README_d/ChangeLog
+++ b/README_d/ChangeLog
@@ -1,3 +1,7 @@
+2021-10-13         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* README.mpfr: Updated.
+
 2020-04-14         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* 5.1.0: Release tar ball made.
diff --git a/README_d/README.mpfr b/README_d/README.mpfr
index e16828d0..996cb8e8 100644
--- a/README_d/README.mpfr
+++ b/README_d/README.mpfr
@@ -53,3 +53,4 @@ of MPFR and GMP versions on GNU/Linux:
 GNU MPFR 2.4.2, GNU MP 4.3.2
 GNU MPFR 3.1.0, GNU MP 5.0.2, 5.0.3
 GNU MPFR 3.1.4, GNU MP 6.1.0
+GNU MPFR 4.0.1, GNU MP 6.1.2
diff --git a/custom.h b/custom.h
index da966d5e..afd323b9 100644
--- a/custom.h
+++ b/custom.h
@@ -11,7 +11,7 @@
  */
 
 /*
- * Copyright (C) 1995-2004, 2008, 2009, 2011, 2016, 2018, 2019, 2020,
+ * Copyright (C) 1995-2004, 2008, 2009, 2011, 2016, 2018-2021,
  * the Free Software Foundation, Inc.
  *
  * This file is part of GAWK, the GNU implementation of the
diff --git a/doc/ChangeLog b/doc/ChangeLog
index ef588757..09a6cbb2 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,8 +1,12 @@
+2021-10-13         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* awkcard.in, gawkinet.texi, gawkworkflow.texi: Update copyright year.
+
 2021-10-09         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* gawktexi.in: Clarify that initialization and increment parts of
 	a for loop can't use the C comma operator.  Thanks to J Naman
-	<jnaman2@gmail.com> for pointing out the doc was too subtle.
+	<gawker@703n.com> for pointing out the doc was too subtle.
 
 	Unrelated: further expand the bug reporting text and discussion
 	about comp.lang.awk.
@@ -39,7 +43,7 @@
 2021-09-23         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* gawktexi.in (Strong Regexp Constants): Document that they
-	can be assigned with -v. Thanks to J Naman <jnaman2@gmail.com>
+	can be assigned with -v. Thanks to J Naman <gawker@703n.com>
 	for the report.
 
 2021-09-22         Arnold D. Robbins     <arnold@skeeve.com>
diff --git a/doc/gawkinet.info b/doc/gawkinet.info
index 1054441f..9ec2bfd6 100644
--- a/doc/gawkinet.info
+++ b/doc/gawkinet.info
@@ -5,8 +5,8 @@ This is Edition 1.6 of 'TCP/IP Internetworking with 'gawk'', for the
 5.1.0 (or later) version of the GNU implementation of AWK.
 
 
-   Copyright (C) 2000, 2001, 2002, 2004, 2009, 2010, 2016, 2019, 2020
-Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2004, 2009, 2010, 2016, 2019, 2020,
+2021 Free Software Foundation, Inc.
 
 
    Permission is granted to copy, distribute and/or modify this document
@@ -40,8 +40,8 @@ This file documents the networking features in GNU Awk ('gawk') version
 5.1.0 (or later) version of the GNU implementation of AWK.
 
 
-   Copyright (C) 2000, 2001, 2002, 2004, 2009, 2010, 2016, 2019, 2020
-Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2004, 2009, 2010, 2016, 2019, 2020,
+2021 Free Software Foundation, Inc.
 
 
    Permission is granted to copy, distribute and/or modify this document
@@ -4432,63 +4432,63 @@ Index
 
 
 Tag Table:
-Node: Top1102
-Node: Preface4757
-Node: Introduction6132
-Node: Stream Communications7158
-Node: Datagram Communications8332
-Node: The TCP/IP Protocols9962
-Ref: The TCP/IP Protocols-Footnote-110646
-Node: Basic Protocols10803
-Ref: Basic Protocols-Footnote-112848
-Node: Ports12877
-Node: Making Connections14284
-Ref: Making Connections-Footnote-116842
-Ref: Making Connections-Footnote-216889
-Node: Using Networking17070
-Node: Gawk Special Files19393
-Node: Special File Fields21202
-Ref: table-inet-components25102
-Node: Comparing Protocols26413
-Node: File /inet/tcp26947
-Node: File /inet/udp27933
-Ref: File /inet/udp-Footnote-129645
-Node: TCP Connecting29899
-Node: Troubleshooting33334
-Ref: Troubleshooting-Footnote-136098
-Node: Interacting37055
-Node: Setting Up41413
-Node: Email45962
-Ref: Email-Footnote-148384
-Node: Web page49192
-Ref: Web page-Footnote-152012
-Ref: Web page-Footnote-252210
-Node: Primitive Service52704
-Node: Interacting Service55438
-Ref: Interacting Service-Footnote-164593
-Node: CGI Lib64625
-Node: Simple Server71625
-Ref: Simple Server-Footnote-179427
-Node: Caveats79528
-Node: Challenges80671
-Ref: Challenges-Footnote-189413
-Node: Some Applications and Techniques89514
-Node: PANIC91975
-Node: GETURL93701
-Node: REMCONF96334
-Node: URLCHK101830
-Node: WEBGRAB105674
-Node: STATIST110138
-Ref: STATIST-Footnote-1123286
-Node: MAZE123729
-Node: MOBAGWHO129954
-Ref: MOBAGWHO-Footnote-1143856
-Node: STOXPRED143924
-Node: PROTBASE158216
-Ref: PROTBASE-Footnote-1171383
-Node: Links171498
-Node: GNU Free Documentation License174389
-Node: Index199509
+Node: Top1108
+Node: Preface4769
+Node: Introduction6144
+Node: Stream Communications7170
+Node: Datagram Communications8344
+Node: The TCP/IP Protocols9974
+Ref: The TCP/IP Protocols-Footnote-110658
+Node: Basic Protocols10815
+Ref: Basic Protocols-Footnote-112860
+Node: Ports12889
+Node: Making Connections14296
+Ref: Making Connections-Footnote-116854
+Ref: Making Connections-Footnote-216901
+Node: Using Networking17082
+Node: Gawk Special Files19405
+Node: Special File Fields21214
+Ref: table-inet-components25114
+Node: Comparing Protocols26425
+Node: File /inet/tcp26959
+Node: File /inet/udp27945
+Ref: File /inet/udp-Footnote-129657
+Node: TCP Connecting29911
+Node: Troubleshooting33346
+Ref: Troubleshooting-Footnote-136110
+Node: Interacting37067
+Node: Setting Up41425
+Node: Email45974
+Ref: Email-Footnote-148396
+Node: Web page49204
+Ref: Web page-Footnote-152024
+Ref: Web page-Footnote-252222
+Node: Primitive Service52716
+Node: Interacting Service55450
+Ref: Interacting Service-Footnote-164605
+Node: CGI Lib64637
+Node: Simple Server71637
+Ref: Simple Server-Footnote-179439
+Node: Caveats79540
+Node: Challenges80683
+Ref: Challenges-Footnote-189425
+Node: Some Applications and Techniques89526
+Node: PANIC91987
+Node: GETURL93713
+Node: REMCONF96346
+Node: URLCHK101842
+Node: WEBGRAB105686
+Node: STATIST110150
+Ref: STATIST-Footnote-1123298
+Node: MAZE123741
+Node: MOBAGWHO129966
+Ref: MOBAGWHO-Footnote-1143868
+Node: STOXPRED143936
+Node: PROTBASE158228
+Ref: PROTBASE-Footnote-1171395
+Node: Links171510
+Node: GNU Free Documentation License174401
+Node: Index199521
 
 End Tag Table
 
diff --git a/doc/gawkinet.texi b/doc/gawkinet.texi
index 94c666c5..fa5c5b63 100644
--- a/doc/gawkinet.texi
+++ b/doc/gawkinet.texi
@@ -75,7 +75,7 @@ This is Edition @value{EDITION} of @cite{@value{TITLE}},
 for the @value{VERSION}.@value{PATCHLEVEL} (or later) version of the GNU
 implementation of AWK.
 @sp 2
-Copyright (C) 2000, 2001, 2002, 2004, 2009, 2010, 2016, 2019, 2020
+Copyright (C) 2000, 2001, 2002, 2004, 2009, 2010, 2016, 2019, 2020, 2021
 Free Software Foundation, Inc.
 @sp 2
 Permission is granted to copy, distribute and/or modify this document
diff --git a/doc/gawkworkflow.info b/doc/gawkworkflow.info
index 0a81e3c1..aea01c51 100644
--- a/doc/gawkworkflow.info
+++ b/doc/gawkworkflow.info
@@ -1,7 +1,7 @@
 This is gawkworkflow.info, produced by makeinfo version 6.7 from
 gawkworkflow.texi.
 
-Copyright (C) 2017, 2018, 2019 Free Software Foundation, Inc.
+Copyright (C) 2017, 2018, 2019, 2020 Free Software Foundation, Inc.
 
 
    This is Edition 0.73 of 'Participating in 'gawk' Development'.
@@ -35,7 +35,7 @@ General Introduction
 This file describes how to participate in software development for GNU
 Awk ('gawk') (http://www.gnu.org/software/gawk).
 
-   Copyright (C) 2017, 2018, 2019 Free Software Foundation, Inc.
+   Copyright (C) 2017, 2018, 2019, 2020 Free Software Foundation, Inc.
 
 
    This is Edition 0.73 of 'Participating in 'gawk' Development'.
@@ -1923,67 +1923,67 @@ Index
 
 
 Tag Table:
-Node: Top1115
-Node: Preface5199
-Node: This Manual6095
-Node: Conventions7584
-Node: Acknowledgments9053
-Node: Reviewers9490
-Node: Contributing9811
-Ref: Contributing-Footnote-113167
-Node: Using Git13199
-Node: Push Pull13955
-Node: Repo Copies15370
-Ref: savannah-repo16353
-Ref: your-repo17386
-Ref: Repo Copies-Footnote-119080
-Node: Local Branches19137
-Ref: your-repo-220910
-Ref: Local Branches-Footnote-121991
-Node: Branches are state22049
-Node: Repo State22772
-Node: Local State24892
-Node: Remotes25556
-Node: Configuring git26870
-Ref: Configuring git-Footnote-129223
-Node: Development without commit access29392
-Node: Cloning30394
-Node: Switching Branches32253
-Node: Starting A New Branch32871
-Ref: Starting A New Branch-Footnote-134759
-Ref: Starting A New Branch-Footnote-234817
-Node: Undoing a change34893
-Node: Updating35494
-Node: Rebasing35996
-Node: Merge Conflicts36608
-Node: Submitting Changes38108
-Ref: Submitting Changes-Footnote-140252
-Ref: Submitting Changes-Footnote-240289
-Ref: Submitting Changes-Footnote-340325
-Node: Removing Branches40371
-Node: Points to remember40907
-Node: Development with commit access42584
-Node: Initial setup43229
-Node: ssh clone44017
-Node: Developing patches44614
-Node: Developing new features45946
-Node: Developing fixes47846
-Node: General practices48929
-Node: Repo Maintenance53748
-Ref: Repo Maintenance-Footnote-156518
-Node: Development Stuff56651
-Node: Coding style57214
-Ref: Coding style-Footnote-157872
-Node: Doing paperwork57962
-Node: Tools58757
-Node: GNU Tools59339
-Node: Compilers61500
-Ref: Compilers-Footnote-164110
-Node: Debugging64148
-Node: Cheat Sheet64885
-Node: Resources68572
-Node: TODO69149
-Node: Index69369
+Node: Top1121
+Node: Preface5211
+Node: This Manual6107
+Node: Conventions7596
+Node: Acknowledgments9065
+Node: Reviewers9502
+Node: Contributing9823
+Ref: Contributing-Footnote-113179
+Node: Using Git13211
+Node: Push Pull13967
+Node: Repo Copies15382
+Ref: savannah-repo16365
+Ref: your-repo17398
+Ref: Repo Copies-Footnote-119092
+Node: Local Branches19149
+Ref: your-repo-220922
+Ref: Local Branches-Footnote-122003
+Node: Branches are state22061
+Node: Repo State22784
+Node: Local State24904
+Node: Remotes25568
+Node: Configuring git26882
+Ref: Configuring git-Footnote-129235
+Node: Development without commit access29404
+Node: Cloning30406
+Node: Switching Branches32265
+Node: Starting A New Branch32883
+Ref: Starting A New Branch-Footnote-134771
+Ref: Starting A New Branch-Footnote-234829
+Node: Undoing a change34905
+Node: Updating35506
+Node: Rebasing36008
+Node: Merge Conflicts36620
+Node: Submitting Changes38120
+Ref: Submitting Changes-Footnote-140264
+Ref: Submitting Changes-Footnote-240301
+Ref: Submitting Changes-Footnote-340337
+Node: Removing Branches40383
+Node: Points to remember40919
+Node: Development with commit access42596
+Node: Initial setup43241
+Node: ssh clone44029
+Node: Developing patches44626
+Node: Developing new features45958
+Node: Developing fixes47858
+Node: General practices48941
+Node: Repo Maintenance53760
+Ref: Repo Maintenance-Footnote-156530
+Node: Development Stuff56663
+Node: Coding style57226
+Ref: Coding style-Footnote-157884
+Node: Doing paperwork57974
+Node: Tools58769
+Node: GNU Tools59351
+Node: Compilers61512
+Ref: Compilers-Footnote-164122
+Node: Debugging64160
+Node: Cheat Sheet64897
+Node: Resources68584
+Node: TODO69161
+Node: Index69381
 
 End Tag Table
 
diff --git a/doc/gawkworkflow.texi b/doc/gawkworkflow.texi
index 4106b75d..ce3ab4e3 100644
--- a/doc/gawkworkflow.texi
+++ b/doc/gawkworkflow.texi
@@ -144,13 +144,13 @@ Fax: +1-617-542-2652
 Email: <email>gnu@@gnu.org</email>
 URL: <ulink url="http://www.gnu.org">http://www.gnu.org/</ulink></literallayout>
 
-<literallayout class="normal">Copyright &copy; 2017, 2018, 2019
+<literallayout class="normal">Copyright &copy; 2017, 2018, 2019, 2020
 Free Software Foundation, Inc.
 All Rights Reserved.</literallayout>
 @end docbook
 
 @ifnotdocbook
-Copyright @copyright{} 2017, 2018, 2019
+Copyright @copyright{} 2017, 2018, 2019, 2020
 Free Software Foundation, Inc.
 @end ifnotdocbook
 @sp 2
diff --git a/extension/ChangeLog b/extension/ChangeLog
index ee4ff404..2ceeecc2 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,7 @@
+2021-10-13         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* ordchr.c: Update copyright year.
+
 2021-09-27         Andrew J. Schorr      <aschorr@telemetry-investments.com>
 
 	* ordchr.c (do_ord): Add white space around cast.
@@ -19,7 +23,6 @@
 	Unrelated:
 
 	* aclocal.m4: Regenerated: Automake 1.16.4.
-	* NEWS: Updated.
 
 2021-09-09         Arnold D. Robbins     <arnold@skeeve.com>
 
@@ -81,7 +84,7 @@
 
 	Miscellanious fixes from Michael Builov <mbuilov@gmail.com>.
 
-	* fts.c (fts_open): Fix memory leak: fts_sort() allocates
+	* gawkfts.c (fts_open): Fix memory leak: fts_sort() allocates
 	sp->fts_array, but it's not freed if next fts_alloc() fails.
 	(fts_build): Need to free "head" list before returning NULL
 	on failure.
diff --git a/extension/ordchr.c b/extension/ordchr.c
index ff990b6b..851414c4 100644
--- a/extension/ordchr.c
+++ b/extension/ordchr.c
@@ -9,7 +9,7 @@
  */
 
 /*
- * Copyright (C) 2001, 2004, 2011, 2012, 2013, 2018, 2020,
+ * Copyright (C) 2001, 2004, 2011, 2012, 2013, 2018, 2020, 2021,
  * the Free Software Foundation, Inc.
  *
  * This file is part of GAWK, the GNU implementation of the
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index 09213462..5b985250 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -141,93 +141,81 @@ CLEANFILES = core core.* fmtspcl.ok
 
 # try to keep these sorted. each letter starts a new line
 BASIC_TESTS = \
-	addcomma anchgsub anchor argarray argcasfile arrayind1 arrayind2 arrayind3 arrayparm \
-	arrayprm2 arrayprm3 arrayref arrymem1 arryref2 arryref3 arryref4 arryref5 \
-	arynasty arynocls aryprm1 aryprm2 aryprm3 aryprm4 aryprm5 aryprm6 aryprm7 \
-	aryprm8 aryprm9 arysubnm aryunasgn asgext awkpath \
-	assignnumfield assignnumfield2 \
-	back89 backgsub badassign1 badbuild \
-	callparam childin clobber closebad clsflnam compare compare2 \
-	concat1 concat2 concat3 concat4 concat5 convfmt \
-	datanonl defref delargv delarpm2 delarprm delfunc \
-	dfacheck2 dfamb1 dfastress dynlj \
-	escapebrace eofsplit eofsrc1 exit2 exitval1 exitval2 exitval3 \
-	fcall_exit fcall_exit2 fldchg fldchgnf fldterm fnamedat fnarray fnarray2 \
-	fnaryscl fnasgnm fnmisc fordel forref forsimp fsbs fscaret fsnul1 \
-	fsrs fsspcoln fstabplus funsemnl funsmnam funstack \
-	getline getline2 getline3 getline4 getline5 getlnbuf getnr2tb getnr2tm \
-	gsubasgn gsubtest gsubtst2 gsubtst3 gsubtst4 gsubtst5 gsubtst6 gsubtst7 \
-	gsubtst8 \
-	hex hex2 hsprint \
-	inpref inputred intest intprec iobug1 \
-	leaddig leadnl litoct longsub longwrds \
-	manglprm math membug1 memleak messages minusstr mmap8k \
-	nasty nasty2 negexp negrange nested nfldstr nfloop nfneg nfset nlfldsep \
-	nlinstr nlstrina noeffect nofile nofmtch noloop1 noloop2 nonl noparms \
-	nors nulinsrc nulrsend numindex numrange numstr1 numsubstr \
-	octsub ofmt ofmta ofmtbig ofmtfidl ofmts ofmtstrnum ofs1 onlynl \
-	opasnidx opasnslf \
-	paramasfunc1 paramasfunc2 paramdup paramres paramtyp paramuninitglobal \
-	parse1 parsefld parseme pcntplus posix_compare posix2008sub prdupval prec printf0 \
-	printf1 printfchar prmarscl prmreuse prt1eval prtoeval \
-	rand randtest range1 range2 readbuf rebrackloc rebt8b1 rebuild redfilnm regeq \
-	regexpbrack regexpbrack2 regexprange regrange reindops reparse resplit \
-	rri1 rs rscompat rsnul1nl rsnulbig rsnulbig2 rsnullre rsnulw \
-	rstest1 rstest2 rstest3 rstest4 rstest5 rswhite \
-	scalar sclforin sclifin setrec0 setrec1 \
-	sigpipe1 sortempty sortglos spacere splitargv splitarr \
-	splitdef splitvar splitwht status-close \
-	strcat1 strfieldnum strnum1 strnum2 strtod \
-	subamp subback subi18n subsepnm subslash substr swaplns synerr1 synerr2 synerr3 \
-	tailrecurse tradanch trailbs tweakfld \
-	uninit2 uninit3 uninit4 uninit5 uninitialized unterm uparrfs uplus \
-	wideidx wideidx2 widesub widesub2 widesub3 widesub4 wjposer1 \
-	zero2 zeroe0 zeroflag
+	addcomma anchgsub anchor argarray argcasfile arrayind1 arrayind2 \
+	arrayind3 arrayparm arrayprm2 arrayprm3 arrayref arrymem1 \
+	arryref2 arryref3 arryref4 arryref5 arynasty arynocls aryprm1 \
+	aryprm2 aryprm3 aryprm4 aryprm5 aryprm6 aryprm7 aryprm8 aryprm9 \
+	arysubnm aryunasgn asgext awkpath assignnumfield assignnumfield2 \
+	back89 backgsub badassign1 badbuild callparam childin clobber \
+	closebad clsflnam compare compare2 concat1 concat2 concat3 concat4 \
+	concat5 convfmt datanonl defref delargv delarpm2 delarprm delfunc \
+	dfacheck2 dfamb1 dfastress dynlj escapebrace eofsplit eofsrc1 \
+	exit2 exitval1 exitval2 exitval3 fcall_exit fcall_exit2 fldchg \
+	fldchgnf fldterm fnamedat fnarray fnarray2 fnaryscl fnasgnm \
+	fnmisc fordel forref forsimp fsbs fscaret fsnul1 fsrs fsspcoln \
+	fstabplus funsemnl funsmnam funstack getline getline2 getline3 \
+	getline4 getline5 getlnbuf getnr2tb getnr2tm gsubasgn gsubtest \
+	gsubtst2 gsubtst3 gsubtst4 gsubtst5 gsubtst6 gsubtst7 gsubtst8 \
+	hex hex2 hsprint inpref inputred intest intprec iobug1 leaddig \
+	leadnl litoct longsub longwrds manglprm math membug1 memleak \
+	messages minusstr mmap8k nasty nasty2 negexp negrange nested \
+	nfldstr nfloop nfneg nfset nlfldsep nlinstr nlstrina noeffect \
+	nofile nofmtch noloop1 noloop2 nonl noparms nors nulinsrc \
+	nulrsend numindex numrange numstr1 numsubstr octsub ofmt \
+	ofmta ofmtbig ofmtfidl ofmts ofmtstrnum ofs1 onlynl opasnidx \
+	opasnslf paramasfunc1 paramasfunc2 paramdup paramres paramtyp \
+	paramuninitglobal parse1 parsefld parseme pcntplus posix_compare \
+	posix2008sub prdupval prec printf0 printf1 printfchar prmarscl \
+	prmreuse prt1eval prtoeval rand randtest range1 range2 readbuf \
+	rebrackloc rebt8b1 rebuild redfilnm regeq regexpbrack regexpbrack2 \
+	regexprange regrange reindops reparse resplit rri1 rs rscompat \
+	rsnul1nl rsnulbig rsnulbig2 rsnullre rsnulw rstest1 rstest2 \
+	rstest3 rstest4 rstest5 rswhite scalar sclforin sclifin setrec0 \
+	setrec1 sigpipe1 sortempty sortglos spacere splitargv splitarr \
+	splitdef splitvar splitwht status-close strcat1 strfieldnum \
+	strnum1 strnum2 strtod subamp subback subi18n subsepnm subslash \
+	substr swaplns synerr1 synerr2 synerr3 tailrecurse tradanch \
+	trailbs tweakfld uninit2 uninit3 uninit4 uninit5 uninitialized \
+	unterm uparrfs uplus wideidx wideidx2 widesub widesub2 widesub3 \
+	widesub4 wjposer1 zero2 zeroe0 zeroflag
 
 UNIX_TESTS = \
 	fflush getlnhd localenl pid pipeio1 pipeio2 poundbang rtlen rtlen01 \
 	space strftlng
 
 GAWK_EXT_TESTS = \
-	aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort arraysort2 \
-	arraytype asortbool \
-	backw badargs beginfile1 beginfile2 binmode1 \
-	charasbytes colonwarn clos1way clos1way2 clos1way3 clos1way4 clos1way5 \
-	clos1way6 commas crlf \
-	dbugeval dbugeval2 dbugeval3 dbugtypedre1 dbugtypedre2 delsub \
-	devfd devfd1 devfd2 dfacheck1 dumpvars \
-	errno exit fieldwdth forcenum \
+	aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort \
+	arraysort2 arraytype asortbool backw badargs beginfile1 \
+	beginfile2 binmode1 charasbytes clos1way clos1way2 clos1way3 \
+	clos1way4 clos1way5 clos1way6 colonwarn commas crlf dbugeval \
+	dbugeval2 dbugeval3 dbugtypedre1 dbugtypedre2 delsub devfd \
+	devfd1 devfd2 dfacheck1 dumpvars errno exit fieldwdth forcenum \
 	fpat1 fpat2 fpat3 fpat4 fpat5 fpat6 fpat7 fpat8 fpat9 fpatnull \
-	fsfwfs funlen functab1 functab2 functab3 functab6 \
-	fwtest fwtest2 fwtest3 fwtest4 fwtest5 fwtest6 fwtest7 fwtest8 \
-	genpot gensub gensub2 gensub3 getlndir gnuops2 gnuops3 gnureops gsubind \
-	icasefs icasers id igncdym igncfs ignrcas2 ignrcas4 ignrcase incdupe \
-	incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 include include2 \
-	indirectbuiltin indirectcall indirectcall2 inf-nan-torture \
-	intarray iolint isarrayunset \
-	lint lintexp lintindex lintint lintlength lintplus lintold lintset lintwarn \
+	fsfwfs functab1 functab2 functab3 functab6 funlen fwtest fwtest2 \
+	fwtest3 fwtest4 fwtest5 fwtest6 fwtest7 fwtest8 genpot gensub \
+	gensub2 gensub3 getlndir gnuops2 gnuops3 gnureops gsubind \
+	icasefs icasers id igncdym igncfs ignrcas2 ignrcas4 ignrcase \
+	incdupe incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 \
+	include include2 indirectbuiltin indirectcall indirectcall2 \
+	inf-nan-torture intarray iolint isarrayunset lint lintexp \
+	lintindex lintint lintlength lintold lintplus lintset lintwarn \
 	manyfiles match1 match2 match3 mbstr1 mbstr2 mixed1 mktime \
-	modifiers muldimposix \
-	nastyparm negtime next nondec nondec2 nonfatal1 nonfatal2 nonfatal3 \
-	nsawk1a nsawk1b nsawk1c nsawk2a nsawk2b \
-	nsbad nsbad_cmd nsforloop nsfuncrecurse nsindirect1 nsindirect2 nsprof1 nsprof2 \
-	octdec \
-	patsplit posix printfbad1 printfbad2 printfbad3 printfbad4 printhuge \
-	procinfs profile0 profile1 profile2 profile3 profile4 profile5 profile6 \
-	profile7 profile8 profile9 profile10 profile11 profile12 profile13 \
-        profile14 profile15 pty1 pty2 \
-	rebuf regexsub regnul1 regnul2 regx8bit reginttrad reint reint2 rsgetline rsglstdin \
-	rsstart1 rsstart2 rsstart3 rstest6 \
-	sandbox1 shadow shadowbuiltin sortfor sortfor2 sortu \
-	sourcesplit split_after_fpat \
-	splitarg4 strftfld strftime strtonum strtonum1 \
-	stupid1 stupid2 stupid3 stupid4 \
-	switch2 symtab1 symtab2 symtab3 symtab4 symtab5 symtab6 symtab7 \
-	symtab8 symtab9 symtab10 symtab11 \
-	timeout typedregex1 typedregex2 typedregex3 typedregex4 \
-	typedregex5 typedregex6 \
-	typeof1 typeof2 typeof3 typeof4 typeof5 typeof6 \
-	watchpoint1
+	modifiers muldimposix nastyparm negtime next nondec nondec2 \
+	nonfatal1 nonfatal2 nonfatal3 nsawk1a nsawk1b nsawk1c nsawk2a \
+	nsawk2b nsbad nsbad_cmd nsforloop nsfuncrecurse nsindirect1 \
+	nsindirect2 nsprof1 nsprof2 octdec patsplit posix printfbad1 \
+	printfbad2 printfbad3 printfbad4 printhuge procinfs profile0 \
+	profile1 profile10 profile11 profile12 profile13 profile14 \
+	profile15 profile2 profile3 profile4 profile5 profile6 profile7 \
+	profile8 profile9 pty1 pty2 rebuf regexsub reginttrad regnul1 \
+	regnul2 regx8bit reint reint2 rsgetline rsglstdin rsstart1 \
+	rsstart2 rsstart3 rstest6 sandbox1 shadow shadowbuiltin sortfor \
+	sortfor2 sortu sourcesplit split_after_fpat splitarg4 strftfld \
+	strftime strtonum strtonum1 stupid1 stupid2 stupid3 stupid4 \
+	switch2 symtab1 symtab10 symtab11 symtab2 symtab3 symtab4 symtab5 \
+	symtab6 symtab7 symtab8 symtab9 timeout typedregex1 typedregex2 \
+	typedregex3 typedregex4 typedregex5 typedregex6 typeof1 typeof2 \
+	typeof3 typeof4 typeof5 typeof6 watchpoint1
 
 ARRAYDEBUG_TESTS = arrdbg
 EXTRA_TESTS = inftest regtest ignrcas3 
@@ -255,17 +243,20 @@ NEED_DEBUG = dbugtypedre1 dbugtypedre2 dbugeval2 dbugeval3
 
 # List of the tests which should be run with --lint option:
 NEED_LINT = \
-	defref fmtspcl lintexp lintindex lintint lintlength lintplus lintwarn \
-	noeffect nofmtch nonl shadow uninit2 uninit3 uninit4 uninit5 uninitialized
+	defref fmtspcl lintexp lintindex lintint lintlength lintplus \
+	lintwarn noeffect nofmtch nonl shadow uninit2 uninit3 uninit4 \
+	uninit5 uninitialized
 
 
 # List of the tests which should be run with --lint-old option:
 NEED_LINT_OLD = lintold
 
 # List of tests that must be run with -M
-NEED_MPFR = mpfrbigint mpfrbigint2 mpfrcase mpfrcase2 mpfrexprange mpfrfield mpfrieee mpfrmemok1 \
-	mpfrnegzero mpfrnonum mpfrnr mpfrrem mpfrrnd mpfrrndeval mpfrsort mpfrsqrt \
-	mpfrstrtonum mpgforcenum mpfruplus mpfranswer42
+NEED_MPFR = \
+	mpfrbigint mpfrbigint2 mpfrcase mpfrcase2 mpfrexprange mpfrfield \
+	mpfrieee mpfrmemok1 mpfrnegzero mpfrnonum mpfrnr mpfrrem mpfrrnd \
+	mpfrrndeval mpfrsort mpfrsqrt mpfrstrtonum mpgforcenum mpfruplus \
+	mpfranswer42
 
 
 # List of tests that need --non-decimal-data
diff --git a/support/ChangeLog b/support/ChangeLog
index 1930b98c..07966b8a 100644
--- a/support/ChangeLog
+++ b/support/ChangeLog
@@ -1,3 +1,7 @@
+2021-10-13         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* xalloc.h: Update copyright year.
+
 2021-09-22         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* idx.h, intprops.h: Sync with GNULIB.
diff --git a/support/Makefile.am b/support/Makefile.am
index a2d2df05..911f000d 100644
--- a/support/Makefile.am
+++ b/support/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Makefile.am --- automake input file for gawk
 #
-# Copyright (C) 2000-2016, 2018, 2019 the Free Software Foundation, Inc.
+# Copyright (C) 2000-2016, 2018, 2019, 2021 the Free Software Foundation, Inc.
 #
 # This file is part of GAWK, the GNU implementation of the
 # AWK Programming Language.
diff --git a/support/Makefile.in b/support/Makefile.in
index 59bb53c3..29591d02 100644
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -17,7 +17,7 @@
 #
 # Makefile.am --- automake input file for gawk
 #
-# Copyright (C) 2000-2016, 2018, 2019 the Free Software Foundation, Inc.
+# Copyright (C) 2000-2016, 2018, 2019, 2021 the Free Software Foundation, Inc.
 #
 # This file is part of GAWK, the GNU implementation of the
 # AWK Programming Language.
diff --git a/support/xalloc.h b/support/xalloc.h
index 38a14873..0f98119c 100644
--- a/support/xalloc.h
+++ b/support/xalloc.h
@@ -1,6 +1,6 @@
 /* xalloc.h -- malloc with out-of-memory checking
 
-   Copyright (C) 1990-2000, 2003-2004, 2006-2019 Free Software Foundation, Inc.
+   Copyright (C) 1990-2000, 2003-2004, 2006-2021 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/test/ChangeLog b/test/ChangeLog
index 882eecc3..c130c7a3 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -4,6 +4,10 @@
 	be edited manually.
 	* Makefile.am: Update relevant targets.
 
+	Unrelated:
+
+	* Makefile.am: Uupdate copryight year, reformat some of the lists.
+
 2021-09-27         Andrew J. Schorr      <aschorr@telemetry-investments.com>
 
 	* ordchr.awk, ordchr.awk: Add test for ord signedness.
diff --git a/test/Makefile.am b/test/Makefile.am
index c4943ba9..e95d097d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,7 +1,7 @@
 #
 # test/Makefile.am --- automake input file for gawk
 #
-# Copyright (C) 1988-2020 the Free Software Foundation, Inc.
+# Copyright (C) 1988-2021 the Free Software Foundation, Inc.
 #
 # This file is part of GAWK, the GNU implementation of the
 # AWK Programming Language.
@@ -1390,93 +1390,81 @@ CLEANFILES = core core.* fmtspcl.ok
 
 # try to keep these sorted. each letter starts a new line
 BASIC_TESTS = \
-	addcomma anchgsub anchor argarray argcasfile arrayind1 arrayind2 arrayind3 arrayparm \
-	arrayprm2 arrayprm3 arrayref arrymem1 arryref2 arryref3 arryref4 arryref5 \
-	arynasty arynocls aryprm1 aryprm2 aryprm3 aryprm4 aryprm5 aryprm6 aryprm7 \
-	aryprm8 aryprm9 arysubnm aryunasgn asgext awkpath \
-	assignnumfield assignnumfield2 \
-	back89 backgsub badassign1 badbuild \
-	callparam childin clobber closebad clsflnam compare compare2 \
-	concat1 concat2 concat3 concat4 concat5 convfmt \
-	datanonl defref delargv delarpm2 delarprm delfunc \
-	dfacheck2 dfamb1 dfastress dynlj \
-	escapebrace eofsplit eofsrc1 exit2 exitval1 exitval2 exitval3 \
-	fcall_exit fcall_exit2 fldchg fldchgnf fldterm fnamedat fnarray fnarray2 \
-	fnaryscl fnasgnm fnmisc fordel forref forsimp fsbs fscaret fsnul1 \
-	fsrs fsspcoln fstabplus funsemnl funsmnam funstack \
-	getline getline2 getline3 getline4 getline5 getlnbuf getnr2tb getnr2tm \
-	gsubasgn gsubtest gsubtst2 gsubtst3 gsubtst4 gsubtst5 gsubtst6 gsubtst7 \
-	gsubtst8 \
-	hex hex2 hsprint \
-	inpref inputred intest intprec iobug1 \
-	leaddig leadnl litoct longsub longwrds \
-	manglprm math membug1 memleak messages minusstr mmap8k \
-	nasty nasty2 negexp negrange nested nfldstr nfloop nfneg nfset nlfldsep \
-	nlinstr nlstrina noeffect nofile nofmtch noloop1 noloop2 nonl noparms \
-	nors nulinsrc nulrsend numindex numrange numstr1 numsubstr \
-	octsub ofmt ofmta ofmtbig ofmtfidl ofmts ofmtstrnum ofs1 onlynl \
-	opasnidx opasnslf \
-	paramasfunc1 paramasfunc2 paramdup paramres paramtyp paramuninitglobal \
-	parse1 parsefld parseme pcntplus posix_compare posix2008sub prdupval prec printf0 \
-	printf1 printfchar prmarscl prmreuse prt1eval prtoeval \
-	rand randtest range1 range2 readbuf rebrackloc rebt8b1 rebuild redfilnm regeq \
-	regexpbrack regexpbrack2 regexprange regrange reindops reparse resplit \
-	rri1 rs rscompat rsnul1nl rsnulbig rsnulbig2 rsnullre rsnulw \
-	rstest1 rstest2 rstest3 rstest4 rstest5 rswhite \
-	scalar sclforin sclifin setrec0 setrec1 \
-	sigpipe1 sortempty sortglos spacere splitargv splitarr \
-	splitdef splitvar splitwht status-close \
-	strcat1 strfieldnum strnum1 strnum2 strtod \
-	subamp subback subi18n subsepnm subslash substr swaplns synerr1 synerr2 synerr3 \
-	tailrecurse tradanch trailbs tweakfld \
-	uninit2 uninit3 uninit4 uninit5 uninitialized unterm uparrfs uplus \
-	wideidx wideidx2 widesub widesub2 widesub3 widesub4 wjposer1 \
-	zero2 zeroe0 zeroflag
+	addcomma anchgsub anchor argarray argcasfile arrayind1 arrayind2 \
+	arrayind3 arrayparm arrayprm2 arrayprm3 arrayref arrymem1 \
+	arryref2 arryref3 arryref4 arryref5 arynasty arynocls aryprm1 \
+	aryprm2 aryprm3 aryprm4 aryprm5 aryprm6 aryprm7 aryprm8 aryprm9 \
+	arysubnm aryunasgn asgext awkpath assignnumfield assignnumfield2 \
+	back89 backgsub badassign1 badbuild callparam childin clobber \
+	closebad clsflnam compare compare2 concat1 concat2 concat3 concat4 \
+	concat5 convfmt datanonl defref delargv delarpm2 delarprm delfunc \
+	dfacheck2 dfamb1 dfastress dynlj escapebrace eofsplit eofsrc1 \
+	exit2 exitval1 exitval2 exitval3 fcall_exit fcall_exit2 fldchg \
+	fldchgnf fldterm fnamedat fnarray fnarray2 fnaryscl fnasgnm \
+	fnmisc fordel forref forsimp fsbs fscaret fsnul1 fsrs fsspcoln \
+	fstabplus funsemnl funsmnam funstack getline getline2 getline3 \
+	getline4 getline5 getlnbuf getnr2tb getnr2tm gsubasgn gsubtest \
+	gsubtst2 gsubtst3 gsubtst4 gsubtst5 gsubtst6 gsubtst7 gsubtst8 \
+	hex hex2 hsprint inpref inputred intest intprec iobug1 leaddig \
+	leadnl litoct longsub longwrds manglprm math membug1 memleak \
+	messages minusstr mmap8k nasty nasty2 negexp negrange nested \
+	nfldstr nfloop nfneg nfset nlfldsep nlinstr nlstrina noeffect \
+	nofile nofmtch noloop1 noloop2 nonl noparms nors nulinsrc \
+	nulrsend numindex numrange numstr1 numsubstr octsub ofmt \
+	ofmta ofmtbig ofmtfidl ofmts ofmtstrnum ofs1 onlynl opasnidx \
+	opasnslf paramasfunc1 paramasfunc2 paramdup paramres paramtyp \
+	paramuninitglobal parse1 parsefld parseme pcntplus posix_compare \
+	posix2008sub prdupval prec printf0 printf1 printfchar prmarscl \
+	prmreuse prt1eval prtoeval rand randtest range1 range2 readbuf \
+	rebrackloc rebt8b1 rebuild redfilnm regeq regexpbrack regexpbrack2 \
+	regexprange regrange reindops reparse resplit rri1 rs rscompat \
+	rsnul1nl rsnulbig rsnulbig2 rsnullre rsnulw rstest1 rstest2 \
+	rstest3 rstest4 rstest5 rswhite scalar sclforin sclifin setrec0 \
+	setrec1 sigpipe1 sortempty sortglos spacere splitargv splitarr \
+	splitdef splitvar splitwht status-close strcat1 strfieldnum \
+	strnum1 strnum2 strtod subamp subback subi18n subsepnm subslash \
+	substr swaplns synerr1 synerr2 synerr3 tailrecurse tradanch \
+	trailbs tweakfld uninit2 uninit3 uninit4 uninit5 uninitialized \
+	unterm uparrfs uplus wideidx wideidx2 widesub widesub2 widesub3 \
+	widesub4 wjposer1 zero2 zeroe0 zeroflag
 
 UNIX_TESTS = \
 	fflush getlnhd localenl pid pipeio1 pipeio2 poundbang rtlen rtlen01 \
 	space strftlng
 
 GAWK_EXT_TESTS = \
-	aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort arraysort2 \
-	arraytype asortbool \
-	backw badargs beginfile1 beginfile2 binmode1 \
-	charasbytes colonwarn clos1way clos1way2 clos1way3 clos1way4 clos1way5 \
-	clos1way6 commas crlf \
-	dbugeval dbugeval2 dbugeval3 dbugtypedre1 dbugtypedre2 delsub \
-	devfd devfd1 devfd2 dfacheck1 dumpvars \
-	errno exit fieldwdth forcenum \
+	aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort \
+	arraysort2 arraytype asortbool backw badargs beginfile1 \
+	beginfile2 binmode1 charasbytes clos1way clos1way2 clos1way3 \
+	clos1way4 clos1way5 clos1way6 colonwarn commas crlf dbugeval \
+	dbugeval2 dbugeval3 dbugtypedre1 dbugtypedre2 delsub devfd \
+	devfd1 devfd2 dfacheck1 dumpvars errno exit fieldwdth forcenum \
 	fpat1 fpat2 fpat3 fpat4 fpat5 fpat6 fpat7 fpat8 fpat9 fpatnull \
-	fsfwfs funlen functab1 functab2 functab3 functab6 \
-	fwtest fwtest2 fwtest3 fwtest4 fwtest5 fwtest6 fwtest7 fwtest8 \
-	genpot gensub gensub2 gensub3 getlndir gnuops2 gnuops3 gnureops gsubind \
-	icasefs icasers id igncdym igncfs ignrcas2 ignrcas4 ignrcase incdupe \
-	incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 include include2 \
-	indirectbuiltin indirectcall indirectcall2 inf-nan-torture \
-	intarray iolint isarrayunset \
-	lint lintexp lintindex lintint lintlength lintplus lintold lintset lintwarn \
+	fsfwfs functab1 functab2 functab3 functab6 funlen fwtest fwtest2 \
+	fwtest3 fwtest4 fwtest5 fwtest6 fwtest7 fwtest8 genpot gensub \
+	gensub2 gensub3 getlndir gnuops2 gnuops3 gnureops gsubind \
+	icasefs icasers id igncdym igncfs ignrcas2 ignrcas4 ignrcase \
+	incdupe incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 \
+	include include2 indirectbuiltin indirectcall indirectcall2 \
+	inf-nan-torture intarray iolint isarrayunset lint lintexp \
+	lintindex lintint lintlength lintold lintplus lintset lintwarn \
 	manyfiles match1 match2 match3 mbstr1 mbstr2 mixed1 mktime \
-	modifiers muldimposix \
-	nastyparm negtime next nondec nondec2 nonfatal1 nonfatal2 nonfatal3 \
-	nsawk1a nsawk1b nsawk1c nsawk2a nsawk2b \
-	nsbad nsbad_cmd nsforloop nsfuncrecurse nsindirect1 nsindirect2 nsprof1 nsprof2 \
-	octdec \
-	patsplit posix printfbad1 printfbad2 printfbad3 printfbad4 printhuge \
-	procinfs profile0 profile1 profile2 profile3 profile4 profile5 profile6 \
-	profile7 profile8 profile9 profile10 profile11 profile12 profile13 \
-        profile14 profile15 pty1 pty2 \
-	rebuf regexsub regnul1 regnul2 regx8bit reginttrad reint reint2 rsgetline rsglstdin \
-	rsstart1 rsstart2 rsstart3 rstest6 \
-	sandbox1 shadow shadowbuiltin sortfor sortfor2 sortu \
-	sourcesplit split_after_fpat \
-	splitarg4 strftfld strftime strtonum strtonum1 \
-	stupid1 stupid2 stupid3 stupid4 \
-	switch2 symtab1 symtab2 symtab3 symtab4 symtab5 symtab6 symtab7 \
-	symtab8 symtab9 symtab10 symtab11 \
-	timeout typedregex1 typedregex2 typedregex3 typedregex4 \
-	typedregex5 typedregex6 \
-	typeof1 typeof2 typeof3 typeof4 typeof5 typeof6 \
-	watchpoint1
+	modifiers muldimposix nastyparm negtime next nondec nondec2 \
+	nonfatal1 nonfatal2 nonfatal3 nsawk1a nsawk1b nsawk1c nsawk2a \
+	nsawk2b nsbad nsbad_cmd nsforloop nsfuncrecurse nsindirect1 \
+	nsindirect2 nsprof1 nsprof2 octdec patsplit posix printfbad1 \
+	printfbad2 printfbad3 printfbad4 printhuge procinfs profile0 \
+	profile1 profile10 profile11 profile12 profile13 profile14 \
+	profile15 profile2 profile3 profile4 profile5 profile6 profile7 \
+	profile8 profile9 pty1 pty2 rebuf regexsub reginttrad regnul1 \
+	regnul2 regx8bit reint reint2 rsgetline rsglstdin rsstart1 \
+	rsstart2 rsstart3 rstest6 sandbox1 shadow shadowbuiltin sortfor \
+	sortfor2 sortu sourcesplit split_after_fpat splitarg4 strftfld \
+	strftime strtonum strtonum1 stupid1 stupid2 stupid3 stupid4 \
+	switch2 symtab1 symtab10 symtab11 symtab2 symtab3 symtab4 symtab5 \
+	symtab6 symtab7 symtab8 symtab9 timeout typedregex1 typedregex2 \
+	typedregex3 typedregex4 typedregex5 typedregex6 typeof1 typeof2 \
+	typeof3 typeof4 typeof5 typeof6 watchpoint1
 
 ARRAYDEBUG_TESTS = arrdbg
 
@@ -1507,16 +1495,19 @@ NEED_DEBUG = dbugtypedre1 dbugtypedre2 dbugeval2 dbugeval3
 
 # List of the tests which should be run with --lint option:
 NEED_LINT = \
-	defref fmtspcl lintexp lintindex lintint lintlength lintplus lintwarn \
-	noeffect nofmtch nonl shadow uninit2 uninit3 uninit4 uninit5 uninitialized
+	defref fmtspcl lintexp lintindex lintint lintlength lintplus \
+	lintwarn noeffect nofmtch nonl shadow uninit2 uninit3 uninit4 \
+	uninit5 uninitialized
 
 # List of the tests which should be run with --lint-old option:
 NEED_LINT_OLD = lintold
 
 # List of tests that must be run with -M
-NEED_MPFR = mpfrbigint mpfrbigint2 mpfrcase mpfrcase2 mpfrexprange mpfrfield mpfrieee mpfrmemok1 \
-	mpfrnegzero mpfrnonum mpfrnr mpfrrem mpfrrnd mpfrrndeval mpfrsort mpfrsqrt \
-	mpfrstrtonum mpgforcenum mpfruplus mpfranswer42
+NEED_MPFR = \
+	mpfrbigint mpfrbigint2 mpfrcase mpfrcase2 mpfrexprange mpfrfield \
+	mpfrieee mpfrmemok1 mpfrnegzero mpfrnonum mpfrnr mpfrrem mpfrrnd \
+	mpfrrndeval mpfrsort mpfrsqrt mpfrstrtonum mpgforcenum mpfruplus \
+	mpfranswer42
 
 # List of tests that need --non-decimal-data
 NEED_NONDEC = mpfrbigint2 nondec2 intarray forcenum
diff --git a/test/Makefile.in b/test/Makefile.in
index 96846a87..b950d09d 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -17,7 +17,7 @@
 #
 # test/Makefile.am --- automake input file for gawk
 #
-# Copyright (C) 1988-2020 the Free Software Foundation, Inc.
+# Copyright (C) 1988-2021 the Free Software Foundation, Inc.
 #
 # This file is part of GAWK, the GNU implementation of the
 # AWK Programming Language.
@@ -1656,93 +1656,81 @@ CLEANFILES = core core.* fmtspcl.ok
 
 # try to keep these sorted. each letter starts a new line
 BASIC_TESTS = \
-	addcomma anchgsub anchor argarray argcasfile arrayind1 arrayind2 arrayind3 arrayparm \
-	arrayprm2 arrayprm3 arrayref arrymem1 arryref2 arryref3 arryref4 arryref5 \
-	arynasty arynocls aryprm1 aryprm2 aryprm3 aryprm4 aryprm5 aryprm6 aryprm7 \
-	aryprm8 aryprm9 arysubnm aryunasgn asgext awkpath \
-	assignnumfield assignnumfield2 \
-	back89 backgsub badassign1 badbuild \
-	callparam childin clobber closebad clsflnam compare compare2 \
-	concat1 concat2 concat3 concat4 concat5 convfmt \
-	datanonl defref delargv delarpm2 delarprm delfunc \
-	dfacheck2 dfamb1 dfastress dynlj \
-	escapebrace eofsplit eofsrc1 exit2 exitval1 exitval2 exitval3 \
-	fcall_exit fcall_exit2 fldchg fldchgnf fldterm fnamedat fnarray fnarray2 \
-	fnaryscl fnasgnm fnmisc fordel forref forsimp fsbs fscaret fsnul1 \
-	fsrs fsspcoln fstabplus funsemnl funsmnam funstack \
-	getline getline2 getline3 getline4 getline5 getlnbuf getnr2tb getnr2tm \
-	gsubasgn gsubtest gsubtst2 gsubtst3 gsubtst4 gsubtst5 gsubtst6 gsubtst7 \
-	gsubtst8 \
-	hex hex2 hsprint \
-	inpref inputred intest intprec iobug1 \
-	leaddig leadnl litoct longsub longwrds \
-	manglprm math membug1 memleak messages minusstr mmap8k \
-	nasty nasty2 negexp negrange nested nfldstr nfloop nfneg nfset nlfldsep \
-	nlinstr nlstrina noeffect nofile nofmtch noloop1 noloop2 nonl noparms \
-	nors nulinsrc nulrsend numindex numrange numstr1 numsubstr \
-	octsub ofmt ofmta ofmtbig ofmtfidl ofmts ofmtstrnum ofs1 onlynl \
-	opasnidx opasnslf \
-	paramasfunc1 paramasfunc2 paramdup paramres paramtyp paramuninitglobal \
-	parse1 parsefld parseme pcntplus posix_compare posix2008sub prdupval prec printf0 \
-	printf1 printfchar prmarscl prmreuse prt1eval prtoeval \
-	rand randtest range1 range2 readbuf rebrackloc rebt8b1 rebuild redfilnm regeq \
-	regexpbrack regexpbrack2 regexprange regrange reindops reparse resplit \
-	rri1 rs rscompat rsnul1nl rsnulbig rsnulbig2 rsnullre rsnulw \
-	rstest1 rstest2 rstest3 rstest4 rstest5 rswhite \
-	scalar sclforin sclifin setrec0 setrec1 \
-	sigpipe1 sortempty sortglos spacere splitargv splitarr \
-	splitdef splitvar splitwht status-close \
-	strcat1 strfieldnum strnum1 strnum2 strtod \
-	subamp subback subi18n subsepnm subslash substr swaplns synerr1 synerr2 synerr3 \
-	tailrecurse tradanch trailbs tweakfld \
-	uninit2 uninit3 uninit4 uninit5 uninitialized unterm uparrfs uplus \
-	wideidx wideidx2 widesub widesub2 widesub3 widesub4 wjposer1 \
-	zero2 zeroe0 zeroflag
+	addcomma anchgsub anchor argarray argcasfile arrayind1 arrayind2 \
+	arrayind3 arrayparm arrayprm2 arrayprm3 arrayref arrymem1 \
+	arryref2 arryref3 arryref4 arryref5 arynasty arynocls aryprm1 \
+	aryprm2 aryprm3 aryprm4 aryprm5 aryprm6 aryprm7 aryprm8 aryprm9 \
+	arysubnm aryunasgn asgext awkpath assignnumfield assignnumfield2 \
+	back89 backgsub badassign1 badbuild callparam childin clobber \
+	closebad clsflnam compare compare2 concat1 concat2 concat3 concat4 \
+	concat5 convfmt datanonl defref delargv delarpm2 delarprm delfunc \
+	dfacheck2 dfamb1 dfastress dynlj escapebrace eofsplit eofsrc1 \
+	exit2 exitval1 exitval2 exitval3 fcall_exit fcall_exit2 fldchg \
+	fldchgnf fldterm fnamedat fnarray fnarray2 fnaryscl fnasgnm \
+	fnmisc fordel forref forsimp fsbs fscaret fsnul1 fsrs fsspcoln \
+	fstabplus funsemnl funsmnam funstack getline getline2 getline3 \
+	getline4 getline5 getlnbuf getnr2tb getnr2tm gsubasgn gsubtest \
+	gsubtst2 gsubtst3 gsubtst4 gsubtst5 gsubtst6 gsubtst7 gsubtst8 \
+	hex hex2 hsprint inpref inputred intest intprec iobug1 leaddig \
+	leadnl litoct longsub longwrds manglprm math membug1 memleak \
+	messages minusstr mmap8k nasty nasty2 negexp negrange nested \
+	nfldstr nfloop nfneg nfset nlfldsep nlinstr nlstrina noeffect \
+	nofile nofmtch noloop1 noloop2 nonl noparms nors nulinsrc \
+	nulrsend numindex numrange numstr1 numsubstr octsub ofmt \
+	ofmta ofmtbig ofmtfidl ofmts ofmtstrnum ofs1 onlynl opasnidx \
+	opasnslf paramasfunc1 paramasfunc2 paramdup paramres paramtyp \
+	paramuninitglobal parse1 parsefld parseme pcntplus posix_compare \
+	posix2008sub prdupval prec printf0 printf1 printfchar prmarscl \
+	prmreuse prt1eval prtoeval rand randtest range1 range2 readbuf \
+	rebrackloc rebt8b1 rebuild redfilnm regeq regexpbrack regexpbrack2 \
+	regexprange regrange reindops reparse resplit rri1 rs rscompat \
+	rsnul1nl rsnulbig rsnulbig2 rsnullre rsnulw rstest1 rstest2 \
+	rstest3 rstest4 rstest5 rswhite scalar sclforin sclifin setrec0 \
+	setrec1 sigpipe1 sortempty sortglos spacere splitargv splitarr \
+	splitdef splitvar splitwht status-close strcat1 strfieldnum \
+	strnum1 strnum2 strtod subamp subback subi18n subsepnm subslash \
+	substr swaplns synerr1 synerr2 synerr3 tailrecurse tradanch \
+	trailbs tweakfld uninit2 uninit3 uninit4 uninit5 uninitialized \
+	unterm uparrfs uplus wideidx wideidx2 widesub widesub2 widesub3 \
+	widesub4 wjposer1 zero2 zeroe0 zeroflag
 
 UNIX_TESTS = \
 	fflush getlnhd localenl pid pipeio1 pipeio2 poundbang rtlen rtlen01 \
 	space strftlng
 
 GAWK_EXT_TESTS = \
-	aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort arraysort2 \
-	arraytype asortbool \
-	backw badargs beginfile1 beginfile2 binmode1 \
-	charasbytes colonwarn clos1way clos1way2 clos1way3 clos1way4 clos1way5 \
-	clos1way6 commas crlf \
-	dbugeval dbugeval2 dbugeval3 dbugtypedre1 dbugtypedre2 delsub \
-	devfd devfd1 devfd2 dfacheck1 dumpvars \
-	errno exit fieldwdth forcenum \
+	aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort \
+	arraysort2 arraytype asortbool backw badargs beginfile1 \
+	beginfile2 binmode1 charasbytes clos1way clos1way2 clos1way3 \
+	clos1way4 clos1way5 clos1way6 colonwarn commas crlf dbugeval \
+	dbugeval2 dbugeval3 dbugtypedre1 dbugtypedre2 delsub devfd \
+	devfd1 devfd2 dfacheck1 dumpvars errno exit fieldwdth forcenum \
 	fpat1 fpat2 fpat3 fpat4 fpat5 fpat6 fpat7 fpat8 fpat9 fpatnull \
-	fsfwfs funlen functab1 functab2 functab3 functab6 \
-	fwtest fwtest2 fwtest3 fwtest4 fwtest5 fwtest6 fwtest7 fwtest8 \
-	genpot gensub gensub2 gensub3 getlndir gnuops2 gnuops3 gnureops gsubind \
-	icasefs icasers id igncdym igncfs ignrcas2 ignrcas4 ignrcase incdupe \
-	incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 include include2 \
-	indirectbuiltin indirectcall indirectcall2 inf-nan-torture \
-	intarray iolint isarrayunset \
-	lint lintexp lintindex lintint lintlength lintplus lintold lintset lintwarn \
+	fsfwfs functab1 functab2 functab3 functab6 funlen fwtest fwtest2 \
+	fwtest3 fwtest4 fwtest5 fwtest6 fwtest7 fwtest8 genpot gensub \
+	gensub2 gensub3 getlndir gnuops2 gnuops3 gnureops gsubind \
+	icasefs icasers id igncdym igncfs ignrcas2 ignrcas4 ignrcase \
+	incdupe incdupe2 incdupe3 incdupe4 incdupe5 incdupe6 incdupe7 \
+	include include2 indirectbuiltin indirectcall indirectcall2 \
+	inf-nan-torture intarray iolint isarrayunset lint lintexp \
+	lintindex lintint lintlength lintold lintplus lintset lintwarn \
 	manyfiles match1 match2 match3 mbstr1 mbstr2 mixed1 mktime \
-	modifiers muldimposix \
-	nastyparm negtime next nondec nondec2 nonfatal1 nonfatal2 nonfatal3 \
-	nsawk1a nsawk1b nsawk1c nsawk2a nsawk2b \
-	nsbad nsbad_cmd nsforloop nsfuncrecurse nsindirect1 nsindirect2 nsprof1 nsprof2 \
-	octdec \
-	patsplit posix printfbad1 printfbad2 printfbad3 printfbad4 printhuge \
-	procinfs profile0 profile1 profile2 profile3 profile4 profile5 profile6 \
-	profile7 profile8 profile9 profile10 profile11 profile12 profile13 \
-        profile14 profile15 pty1 pty2 \
-	rebuf regexsub regnul1 regnul2 regx8bit reginttrad reint reint2 rsgetline rsglstdin \
-	rsstart1 rsstart2 rsstart3 rstest6 \
-	sandbox1 shadow shadowbuiltin sortfor sortfor2 sortu \
-	sourcesplit split_after_fpat \
-	splitarg4 strftfld strftime strtonum strtonum1 \
-	stupid1 stupid2 stupid3 stupid4 \
-	switch2 symtab1 symtab2 symtab3 symtab4 symtab5 symtab6 symtab7 \
-	symtab8 symtab9 symtab10 symtab11 \
-	timeout typedregex1 typedregex2 typedregex3 typedregex4 \
-	typedregex5 typedregex6 \
-	typeof1 typeof2 typeof3 typeof4 typeof5 typeof6 \
-	watchpoint1
+	modifiers muldimposix nastyparm negtime next nondec nondec2 \
+	nonfatal1 nonfatal2 nonfatal3 nsawk1a nsawk1b nsawk1c nsawk2a \
+	nsawk2b nsbad nsbad_cmd nsforloop nsfuncrecurse nsindirect1 \
+	nsindirect2 nsprof1 nsprof2 octdec patsplit posix printfbad1 \
+	printfbad2 printfbad3 printfbad4 printhuge procinfs profile0 \
+	profile1 profile10 profile11 profile12 profile13 profile14 \
+	profile15 profile2 profile3 profile4 profile5 profile6 profile7 \
+	profile8 profile9 pty1 pty2 rebuf regexsub reginttrad regnul1 \
+	regnul2 regx8bit reint reint2 rsgetline rsglstdin rsstart1 \
+	rsstart2 rsstart3 rstest6 sandbox1 shadow shadowbuiltin sortfor \
+	sortfor2 sortu sourcesplit split_after_fpat splitarg4 strftfld \
+	strftime strtonum strtonum1 stupid1 stupid2 stupid3 stupid4 \
+	switch2 symtab1 symtab10 symtab11 symtab2 symtab3 symtab4 symtab5 \
+	symtab6 symtab7 symtab8 symtab9 timeout typedregex1 typedregex2 \
+	typedregex3 typedregex4 typedregex5 typedregex6 typeof1 typeof2 \
+	typeof3 typeof4 typeof5 typeof6 watchpoint1
 
 ARRAYDEBUG_TESTS = arrdbg
 EXTRA_TESTS = inftest regtest ignrcas3 
@@ -1770,17 +1758,20 @@ NEED_DEBUG = dbugtypedre1 dbugtypedre2 dbugeval2 dbugeval3
 
 # List of the tests which should be run with --lint option:
 NEED_LINT = \
-	defref fmtspcl lintexp lintindex lintint lintlength lintplus lintwarn \
-	noeffect nofmtch nonl shadow uninit2 uninit3 uninit4 uninit5 uninitialized
+	defref fmtspcl lintexp lintindex lintint lintlength lintplus \
+	lintwarn noeffect nofmtch nonl shadow uninit2 uninit3 uninit4 \
+	uninit5 uninitialized
 
 
 # List of the tests which should be run with --lint-old option:
 NEED_LINT_OLD = lintold
 
 # List of tests that must be run with -M
-NEED_MPFR = mpfrbigint mpfrbigint2 mpfrcase mpfrcase2 mpfrexprange mpfrfield mpfrieee mpfrmemok1 \
-	mpfrnegzero mpfrnonum mpfrnr mpfrrem mpfrrnd mpfrrndeval mpfrsort mpfrsqrt \
-	mpfrstrtonum mpgforcenum mpfruplus mpfranswer42
+NEED_MPFR = \
+	mpfrbigint mpfrbigint2 mpfrcase mpfrcase2 mpfrexprange mpfrfield \
+	mpfrieee mpfrmemok1 mpfrnegzero mpfrnonum mpfrnr mpfrrem mpfrrnd \
+	mpfrrndeval mpfrsort mpfrsqrt mpfrstrtonum mpgforcenum mpfruplus \
+	mpfranswer42
 
 
 # List of tests that need --non-decimal-data
@@ -4427,11 +4418,6 @@ fsfwfs:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-funlen:
-	@echo $@
-	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
 functab1:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -4452,6 +4438,11 @@ functab6:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+funlen:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 fwtest:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -4633,14 +4624,14 @@ lintlength:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-lintplus:
+lintold:
 	@echo $@
-	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --lint-old < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-lintold:
+lintplus:
 	@echo $@
-	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --lint-old < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 lintset:
@@ -4801,42 +4792,42 @@ procinfs:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-profile4:
+profile10:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-profile8:
+profile11:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-profile9:
+profile13:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-profile10:
+profile14:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-profile11:
+profile15:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-profile13:
+profile4:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-profile14:
+profile8:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-profile15:
+profile9:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
@@ -4977,6 +4968,16 @@ symtab1:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+symtab10:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+symtab11:
+	@echo $@ $(ZOS_FAIL)
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 symtab2:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -5002,16 +5003,6 @@ symtab7:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-symtab10:
-	@echo $@
-	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
-symtab11:
-	@echo $@ $(ZOS_FAIL)
-	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
 timeout:
 	@echo $@ $(ZOS_FAIL)
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
diff --git a/test/Maketests b/test/Maketests
index d8097ba1..ec749212 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -1482,11 +1482,6 @@ fsfwfs:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-funlen:
-	@echo $@
-	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
 functab1:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -1507,6 +1502,11 @@ functab6:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+funlen:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 fwtest:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -1688,14 +1688,14 @@ lintlength:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-lintplus:
+lintold:
 	@echo $@
-	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --lint-old < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-lintold:
+lintplus:
 	@echo $@
-	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --lint-old < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
 lintset:
@@ -1856,42 +1856,42 @@ procinfs:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-profile4:
+profile10:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-profile8:
+profile11:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-profile9:
+profile13:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-profile10:
+profile14:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-profile11:
+profile15:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-profile13:
+profile4:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-profile14:
+profile8:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-profile15:
+profile9:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  --pretty-print=_$@ >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
@@ -2032,6 +2032,16 @@ symtab1:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
+symtab10:
+	@echo $@
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
+symtab11:
+	@echo $@ $(ZOS_FAIL)
+	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
+
 symtab2:
 	@echo $@
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -2057,16 +2067,6 @@ symtab7:
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
 
-symtab10:
-	@echo $@
-	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
-symtab11:
-	@echo $@ $(ZOS_FAIL)
-	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-	@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
-
 timeout:
 	@echo $@ $(ZOS_FAIL)
 	@AWKPATH="$(srcdir)" $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@