* config.sub (aarch64_ilp32, aarch64_be_ilp32, aarch64_ilp32-*) (aarch64_be_ilp32-*): New. * config.guess (aarch64:Linux:*:*, aarch64_be:Linux:*:*): Unify. Append _ilp32 to UNAME_MACHINE if ILP32 ABI is detected. --- config.guess | 16 ++++++++++------ config.sub | 6 +++--- 2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/config.guess b/config.guess index 2e9ad7fe81..8e0bfd890e 100755 --- a/config.guess +++ b/config.guess @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2016-10-02' +timestamp='2016-12-05' # 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 @@ -908,11 +908,15 @@ EOF i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; - aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - aarch64_be:Linux:*:*) - UNAME_MACHINE=aarch64_be + aarch64:Linux:*:* | aarch64_be:Linux:*:*) + eval $set_cc_for_build + if echo __ILP32__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ILP32__ + then + : + else + UNAME_MACHINE=${UNAME_MACHINE}_ilp32 + fi echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) diff --git a/config.sub b/config.sub index 3478c1fd0d..8f7e1746d1 100755 --- a/config.sub +++ b/config.sub @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2016-11-19' +timestamp='2016-12-05' # 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 @@ -247,7 +247,7 @@ case $basic_machine in # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ - | aarch64 | aarch64_be \ + | aarch64 | aarch64_be | aarch64_ilp32 | aarch64_be_ilp32 \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ @@ -371,7 +371,7 @@ case $basic_machine in # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ - | aarch64-* | aarch64_be-* \ + | aarch64-* | aarch64_be-* | aarch64_ilp32-* | aarch64_be_ilp32-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ -- 2.11.0 -- Andreas Schwab, SUSE Labs, sch...@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different." _______________________________________________ config-patches mailing list config-patches@gnu.org https://lists.gnu.org/mailman/listinfo/config-patches