aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2018-02-26 08:57:44 -0800
committerPaul Eggert2018-02-26 08:58:38 -0800
commit7df482a82065f3c4ea78a4f53462c627fa820860 (patch)
treef6de63594553058ce9baf9cee310ee02e0f0ce23
parent9f56d04df40cac6767b7fbed89737ce9f03f5d80 (diff)
downloademacs-7df482a82065f3c4ea78a4f53462c627fa820860.tar.gz
emacs-7df482a82065f3c4ea78a4f53462c627fa820860.zip
Update from gnulib
* build-aux/config.guess, build-aux/config.sub: Copy from gnulib.
-rwxr-xr-xbuild-aux/config.guess8
-rwxr-xr-xbuild-aux/config.sub5
2 files changed, 9 insertions, 4 deletions
diff --git a/build-aux/config.guess b/build-aux/config.guess
index 9baaa270bfc..f50dcdb6de2 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -2,7 +2,7 @@
2# Attempt to guess a canonical system name. 2# Attempt to guess a canonical system name.
3# Copyright 1992-2018 Free Software Foundation, Inc. 3# Copyright 1992-2018 Free Software Foundation, Inc.
4 4
5timestamp='2018-01-26' 5timestamp='2018-02-24'
6 6
7# This file is free software; you can redistribute it and/or modify it 7# This file is free software; you can redistribute it and/or modify it
8# under the terms of the GNU General Public License as published by 8# under the terms of the GNU General Public License as published by
@@ -1046,7 +1046,11 @@ EOF
1046 echo "$UNAME_MACHINE"-dec-linux-"$LIBC" 1046 echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
1047 exit ;; 1047 exit ;;
1048 x86_64:Linux:*:*) 1048 x86_64:Linux:*:*)
1049 echo "$UNAME_MACHINE"-pc-linux-"$LIBC" 1049 if objdump -f /bin/sh | grep -q elf32-x86-64; then
1050 echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
1051 else
1052 echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
1053 fi
1050 exit ;; 1054 exit ;;
1051 xtensa*:Linux:*:*) 1055 xtensa*:Linux:*:*)
1052 echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" 1056 echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
diff --git a/build-aux/config.sub b/build-aux/config.sub
index 818892c1c31..1d8e98bcee2 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -2,7 +2,7 @@
2# Configuration validation subroutine script. 2# Configuration validation subroutine script.
3# Copyright 1992-2018 Free Software Foundation, Inc. 3# Copyright 1992-2018 Free Software Foundation, Inc.
4 4
5timestamp='2018-01-15' 5timestamp='2018-02-22'
6 6
7# This file is free software; you can redistribute it and/or modify it 7# This file is free software; you can redistribute it and/or modify it
8# under the terms of the GNU General Public License as published by 8# under the terms of the GNU General Public License as published by
@@ -1389,7 +1389,8 @@ case $os in
1389 | -morphos* | -superux* | -rtmk* | -windiss* \ 1389 | -morphos* | -superux* | -rtmk* | -windiss* \
1390 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ 1390 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1391 | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ 1391 | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
1392 | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme*) 1392 | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
1393 | -midnightbsd*)
1393 # Remember, each alternative MUST END IN *, to match a version number. 1394 # Remember, each alternative MUST END IN *, to match a version number.
1394 ;; 1395 ;;
1395 -qnx*) 1396 -qnx*)