Merge branch 'gawk-4.2-stable'

8 files changed, 29 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 26ec271f..ba7c97d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-02-10         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* main.c, msg.c: Add a call to fflush(NULL) before each call
+	to abort(), since GLIBC 2.27 doesn't necessarily flush before
+	aborting.  Thanks to Nelson H.F. Beebe for the report.
+
 2018-02-09         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* io.c (socketopen): Rearrange assigning the flags to use
diff --git a/main.c b/main.c
index 2860d246..25a628ba 100644
--- a/main.c
+++ b/main.c
@@ -1226,6 +1226,8 @@ catchsig(int sig)
 		set_loc(__FILE__, __LINE__);
 		msg(_("fatal error: internal error"));
 		/* fatal won't abort() if not compiled for debugging */
+		// GLIBC 2.27 doesn't necessarily flush on abort. Sigh.
+		fflush(NULL);
 		abort();
 	} else
 		cant_happen();
@@ -1240,6 +1242,7 @@ catchsegv(void *fault_address, int serious)
 {
 	set_loc(__FILE__, __LINE__);
 	msg(_("fatal error: internal error: segfault"));
+	fflush(NULL);
 	abort();
 	/*NOTREACHED*/
 	return 0;
@@ -1252,6 +1255,7 @@ catchstackoverflow(int emergency, stackoverflow_context_t scp)
 {
 	set_loc(__FILE__, __LINE__);
 	msg(_("fatal error: internal error: stack overflow"));
+	fflush(NULL);
 	abort();
 	/*NOTREACHED*/
 	return;
diff --git a/msg.c b/msg.c
index b4746988..20732bcd 100644
--- a/msg.c
+++ b/msg.c
@@ -101,6 +101,8 @@ err(bool isfatal, const char *s, const char *emsg, va_list argp)
 
 	if (isfatal) {
 #ifdef GAWKDEBUG
+		// GLIBC 2.27 doesn't necessarily flush on abort. Sigh.
+		fflush(NULL);
 		abort();
 #endif
 		gawk_exit(EXIT_FATAL);
diff --git a/pc/ChangeLog b/pc/ChangeLog
index 98b92d0a..0ac91608 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,7 @@
+2018-02-10  Eli Zaretskii  <eliz@gnu.org>
+
+	* Makefile.tst (MPFR_TESTS): Update to match test/Makefile.in.
+
 2018-02-03  Eli Zaretskii  <eliz@gnu.org>
 
 	* Makefile.tst (BASIC_TESTS): Add numstr1.
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index f0d13415..a5d5e373 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -222,7 +222,9 @@ ARRAYDEBUG_TESTS = arrdbg
 EXTRA_TESTS = inftest regtest ignrcas3 
 INET_TESTS = inetdayu inetdayt inetechu inetecht
 MACHINE_TESTS = double1 double2 fmtspcl intformat
-MPFR_TESTS = mpfrnr mpfrnegzero mpfrmemok1 mpfrrem mpfrrnd mpfrrndeval mpfrieee
+MPFR_TESTS = mpfrbigint mpfrexprange mpfrieee mpfrmemok1 mpfrnegzero \
+	mpfrnr mpfrrem mpfrrnd mpfrrndeval mpfrsort mpfrsqrt \
+	mpfrstrtonum mpgforcenum mpfruplus
 LOCALE_CHARSET_TESTS = \
 	asort asorti backbigs1 backsmalls1 backsmalls2 \
 	fmttest fnarydel fnparydl jarebug lc_num1 mbfw1 \
diff --git a/test/ChangeLog b/test/ChangeLog
index c239ba24..e633b33e 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2018-02-10         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (mtchi18n): Move into locale tests.
+	Thanks to Kiyoshi KANAZAWA <yoi_no_myoujou@yahoo.co.jp>
+	for the report.
+
 2018-02-07         Andrew J. Schorr     <aschorr@telemetry-investments.com>
 
 	* Makefile.am (uplus, mpfruplus): Add new tests.
diff --git a/test/Makefile.am b/test/Makefile.am
index 1100cb4c..bf1dbd32 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1236,7 +1236,7 @@ BASIC_TESTS = \
 	hex hex2 hsprint \
 	inpref inputred intest intprec iobug1 \
 	leaddig leadnl litoct longsub longwrds \
-	manglprm math membug1 memleak messages minusstr mmap8k mtchi18n \
+	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 numstr1 numsubstr \
@@ -1308,7 +1308,7 @@ LOCALE_CHARSET_TESTS = \
 	asort asorti backbigs1 backsmalls1 backsmalls2 \
 	fmttest fnarydel fnparydl jarebug lc_num1 mbfw1 \
 	mbprintf1 mbprintf2 mbprintf3 mbprintf4 mbprintf5 \
-	nlstringtest rebt8b2 rtlenmb sort1 sprintfc
+	mtchi18n nlstringtest rebt8b2 rtlenmb sort1 sprintfc
 
 SHLIB_TESTS = \
 	apiterm \
diff --git a/test/Makefile.in b/test/Makefile.in
index 3de436f0..f96151be 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1493,7 +1493,7 @@ BASIC_TESTS = \
 	hex hex2 hsprint \
 	inpref inputred intest intprec iobug1 \
 	leaddig leadnl litoct longsub longwrds \
-	manglprm math membug1 memleak messages minusstr mmap8k mtchi18n \
+	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 numstr1 numsubstr \
@@ -1561,7 +1561,7 @@ LOCALE_CHARSET_TESTS = \
 	asort asorti backbigs1 backsmalls1 backsmalls2 \
 	fmttest fnarydel fnparydl jarebug lc_num1 mbfw1 \
 	mbprintf1 mbprintf2 mbprintf3 mbprintf4 mbprintf5 \
-	nlstringtest rebt8b2 rtlenmb sort1 sprintfc
+	mtchi18n nlstringtest rebt8b2 rtlenmb sort1 sprintfc
 
 SHLIB_TESTS = \
 	apiterm \