From 8d4e4ce15b4a98a50b3239ee0a4fdb0c8d1518c9 Mon Sep 17 00:00:00 2001
From: Ben Elliston <bje@gnu.org>
Date: Thu, 1 Mar 2018 07:08:40 +1100
Subject: [PATCH] Revert for now:

	2018-02-24  James Clarke  <jrtc27@jrtc27.com>

	* config.guess (x86_64:Linux:*:*): Detect x32 ABI.
---
 ChangeLog    | 7 +++++++
 config.guess | 8 ++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 86402e5..1c153cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-03-01  Ben Elliston  <bje@gnu.org>
+
+	Revert:
+	2018-02-24  James Clarke  <jrtc27@jrtc27.com>
+
+	* config.guess (x86_64:Linux:*:*): Detect x32 ABI.
+
 2018-02-28  Rishi Khan  <rishi@extreme-scale.com>
 
 	* config.sub (hcos-*): Recognise.
diff --git a/config.guess b/config.guess
index f50dcdb..9baaa27 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-02-24'
+timestamp='2018-01-26'
 
 # 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
@@ -1046,11 +1046,7 @@ EOF
 	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
 	exit ;;
     x86_64:Linux:*:*)
-	if objdump -f /bin/sh | grep -q elf32-x86-64; then
-	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
-	else
-	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
-	fi
+	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
 	exit ;;
     xtensa*:Linux:*:*)
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"