From c262b492d5546e4030c0506d08b473a885828baa Mon Sep 17 00:00:00 2001
From: Ben Elliston <bje@gnu.org>
Date: Fri, 7 Dec 2018 08:08:51 +1100
Subject: [PATCH] 	* config.guess: No need to explicitly save $? in the
 EXIT trap 	handler. This allows the same trap handler to be used as for
 other 	common signals.

---
 ChangeLog    | 6 ++++++
 config.guess | 5 ++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9268435..2351394 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-12-07  Ben Elliston  <bje@gnu.org>
+
+	* config.guess: No need to explicitly save $? in the EXIT trap
+	handler. This allows the same trap handler to be used as for other
+	common signals.
+
 2018-11-26  Lauri Tirkkonen  <lotheac@iki.fi>
 
 	* config.guess (*:Unleashed:*:*): New.
diff --git a/config.guess b/config.guess
index 47d7bed..94c4ac1 100755
--- a/config.guess
+++ b/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-11-28'
+timestamp='2018-12-07'
 
 # 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
@@ -96,8 +96,7 @@ fi
 
 tmp=
 # shellcheck disable=SC2172
-trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15
-trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0
+trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
 
 set_cc_for_build() {
     : "${TMPDIR=/tmp}"