From bd9626458c30d7faec17d7dfbd85a80617b10007 Mon Sep 17 00:00:00 2001 From: James Clarke Date: Sat, 24 Feb 2018 12:34:33 +1100 Subject: [PATCH] * config.guess (x86_64:Linux:*:*): Detect x32 ABI. Signed-off-by: Ben Elliston --- ChangeLog | 4 ++++ config.guess | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 842aed6..14312a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2018-02-24 James Clarke + + * config.guess (x86_64:Linux:*:*): Detect x32 ABI. + 2018-02-22 Ben Elliston Reported by Nelson H. F. Beebe: diff --git a/config.guess b/config.guess index 9baaa27..f50dcdb 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-01-26' +timestamp='2018-02-24' # 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,7 +1046,11 @@ EOF echo "$UNAME_MACHINE"-dec-linux-"$LIBC" exit ;; x86_64:Linux:*:*) - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" + 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 exit ;; xtensa*:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"