diff options
| author | Paul Eggert | 2018-07-06 23:17:30 -0700 |
|---|---|---|
| committer | Paul Eggert | 2018-07-06 23:18:22 -0700 |
| commit | 130310893a41b925d620ee694ac9c2adcf5046ec (patch) | |
| tree | 32488913871ed707fc7c1255b241293aebfbf284 | |
| parent | 6c60c4e2ff6a8c2d70b67fca868c27ebb125ee4d (diff) | |
| download | emacs-130310893a41b925d620ee694ac9c2adcf5046ec.tar.gz emacs-130310893a41b925d620ee694ac9c2adcf5046ec.zip | |
Update from gnulib
This incorporates:
2018-07-04 gnulib-tool: minor tweaks for --gnu-make
* build-aux/config.guess, build-aux/config.sub: Copy from Gnulib.
* lib/gnulib.mk.in: Regenerate.
| -rwxr-xr-x | build-aux/config.guess | 6 | ||||
| -rwxr-xr-x | build-aux/config.sub | 12 | ||||
| -rw-r--r-- | lib/gnulib.mk.in | 1 |
3 files changed, 6 insertions, 13 deletions
diff --git a/build-aux/config.guess b/build-aux/config.guess index 445c406836e..2b79f6d837b 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 | ||
| 5 | timestamp='2018-06-26' | 5 | timestamp='2018-07-06' |
| 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 |
| @@ -101,8 +101,8 @@ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && e | |||
| 101 | trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; | 101 | trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; |
| 102 | : ${TMPDIR=/tmp} ; | 102 | : ${TMPDIR=/tmp} ; |
| 103 | { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || | 103 | { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || |
| 104 | { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || | 104 | { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp 2>/dev/null) ; } || |
| 105 | { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || | 105 | { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || |
| 106 | { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; | 106 | { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; |
| 107 | dummy=$tmp/dummy ; | 107 | dummy=$tmp/dummy ; |
| 108 | tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; | 108 | tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; |
diff --git a/build-aux/config.sub b/build-aux/config.sub index 072700fb037..c95acc681d1 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 | ||
| 5 | timestamp='2018-07-02' | 5 | timestamp='2018-07-03' |
| 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 |
| @@ -625,7 +625,7 @@ case $basic_machine in | |||
| 625 | | powerpc | powerpc64 | powerpc64le | powerpcle \ | 625 | | powerpc | powerpc64 | powerpc64le | powerpcle \ |
| 626 | | pru \ | 626 | | pru \ |
| 627 | | pyramid \ | 627 | | pyramid \ |
| 628 | | riscv32 | riscv64 \ | 628 | | riscv | riscv32 | riscv64 \ |
| 629 | | rl78 | rx \ | 629 | | rl78 | rx \ |
| 630 | | score \ | 630 | | score \ |
| 631 | | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | 631 | | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ |
| @@ -752,7 +752,7 @@ case $basic_machine in | |||
| 752 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | 752 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ |
| 753 | | pru-* \ | 753 | | pru-* \ |
| 754 | | pyramid-* \ | 754 | | pyramid-* \ |
| 755 | | riscv32-* | riscv64-* \ | 755 | | riscv-* | riscv32-* | riscv64-* \ |
| 756 | | rl78-* | romp-* | rs6000-* | rx-* \ | 756 | | rl78-* | romp-* | rs6000-* | rx-* \ |
| 757 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | 757 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ |
| 758 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | 758 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
| @@ -1125,12 +1125,6 @@ case $basic_machine in | |||
| 1125 | ps2) | 1125 | ps2) |
| 1126 | basic_machine=i386-ibm | 1126 | basic_machine=i386-ibm |
| 1127 | ;; | 1127 | ;; |
| 1128 | riscv) | ||
| 1129 | basic_machine=riscv32-unknown | ||
| 1130 | ;; | ||
| 1131 | riscv-*) | ||
| 1132 | basic_machine=`echo "$basic_machine" | sed 's/^riscv/riscv32/'` | ||
| 1133 | ;; | ||
| 1134 | rm[46]00) | 1128 | rm[46]00) |
| 1135 | basic_machine=mips-siemens | 1129 | basic_machine=mips-siemens |
| 1136 | ;; | 1130 | ;; |
diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in index 19128bab2da..220f5042745 100644 --- a/lib/gnulib.mk.in +++ b/lib/gnulib.mk.in | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | ## DO NOT EDIT! GENERATED AUTOMATICALLY! | 1 | ## DO NOT EDIT! GENERATED AUTOMATICALLY! |
| 2 | ## Process this file with automake to produce Makefile.in. | ||
| 3 | # Copyright (C) 2002-2018 Free Software Foundation, Inc. | 2 | # Copyright (C) 2002-2018 Free Software Foundation, Inc. |
| 4 | # | 3 | # |
| 5 | # This file is free software; you can redistribute it and/or modify | 4 | # This file is free software; you can redistribute it and/or modify |