Re: PR/55578

[Simon Gerraty <sjg%crufty.net@localhost>]

The following reply was made to PR toolchain/55578; it has been noted by GNATS.

From: Simon Gerraty <sjg%crufty.net@localhost>
To: Roland Illig <roland.illig%gmx.de@localhost>
Cc: gnats-bugs%netbsd.org@localhost, sjg%crufty.net@localhost
Subject: Re: PR/55578
Date: Thu, 07 Jan 2021 10:38:12 -0800

 The following, should hopefully strike a good balance between
 not missing a 'stopped in' and supressing noise.
 The exit(6) is to disambiguate a specific corner case.
 
 diff -r 264252545986 job.c
 --- a/job.c	Sat Jan 02 09:19:54 2021 -0800
 +++ b/job.c	Thu Jan 07 10:35:18 2021 -0800
 @@ -2908,7 +2908,7 @@
  		       errno == EAGAIN)
  			continue;
  		if (shouldDieQuietly(NULL, 1))
 -			exit(2);
 +			exit(6);	/* we aborted */
  		Fatal("A failure has been detected "
  		      "in another branch of the parallel make");
  	}
 diff -r 264252545986 main.c
 --- a/main.c	Sat Jan 02 09:19:54 2021 -0800
 +++ b/main.c	Thu Jan 07 10:35:18 2021 -0800
 @@ -2159,10 +2159,6 @@
  		Var_Stats();
  	}
  
 -	/* we generally want to keep quiet if a sub-make died */
 -	if (shouldDieQuietly(gn, -1))
 -		return;
 -
  	if (msg != NULL)
  		printf("%s", msg);
  	printf("\n%s: stopped in %s\n", progname, curdir);
 @@ -2170,6 +2166,10 @@
  	if (errorNode != NULL)
  		return;		/* we've been here! */
  
 +	/* we generally want to keep quiet if a sub-make died */
 +	if (shouldDieQuietly(gn, -1))
 +		return;
 +
  	if (gn != NULL)
  		SetErrorVars(gn);