diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-02-26 08:57:44 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-02-26 08:58:38 -0800 |
| commit | 7df482a82065f3c4ea78a4f53462c627fa820860 (patch) | |
| tree | f6de63594553058ce9baf9cee310ee02e0f0ce23 /build-aux | |
| parent | 9f56d04df40cac6767b7fbed89737ce9f03f5d80 (diff) | |
| download | emacs-7df482a82065f3c4ea78a4f53462c627fa820860.tar.gz | |
Update from gnulib
* build-aux/config.guess, build-aux/config.sub: Copy from gnulib.
Diffstat (limited to 'build-aux')
| -rwxr-xr-x | build-aux/config.guess | 8 | ||||
| -rwxr-xr-x | build-aux/config.sub | 5 |
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 @@ # 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" 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 @@ # Configuration validation subroutine script. # Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2018-01-15' +timestamp='2018-02-22' # 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 @@ -1389,7 +1389,8 @@ case $os in | -morphos* | -superux* | -rtmk* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme*) + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ + | -midnightbsd*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) |