Update from Gnulib

* build-aux/config.sub, lib/intprops.h, lib/regex_internal.c:
* lib/regex_internal.h, lib/unistd.in.h, m4/limits-h.m4:
* m4/stdint.m4, m4/unistd_h.m4:
Copy from Gnulib.
* lib/gnulib.mk.in: Regenerate.

9 files changed, 352 insertions, 293 deletions

diff --git a/build-aux/config.sub b/build-aux/config.sub
index 6e8fa65549e..49b16732eb6 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-08-13'
+timestamp='2018-08-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
@@ -692,6 +692,9 @@ case $basic_machine in
         mac | mpw | mac-mpw)
                 basic_machine=m68k-apple
                 ;;
+        microblaze | microblazeel)
+                basic_machine=$basic_machine-xilinx
+                ;;
         pmac | pmac-mpw)
                 basic_machine=powerpc-apple
                 ;;
@@ -699,226 +702,6 @@ case $basic_machine in
                 basic_machine=xps100-honeywell
                 ;;
 
-        # Recognize the basic CPU types without company name.
-        # Some are omitted here because they have special meanings below.
-        1750a | 580 \
-        | a29k \
-        | aarch64 | aarch64_be \
-        | abacus \
-        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-        | am33_2.0 \
-        | arc | arceb \
-        | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv6m | armv[78][arm] \
-        | avr | avr32 \
-        | asmjs \
-        | ba \
-        | be32 | be64 \
-        | bfin \
-        | c4x | c8051 | clipper | csky \
-        | d10v | d30v | dlx | dsp16xx \
-        | e2k | epiphany \
-        | fido | fr30 | frv | ft32 \
-        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-        | hexagon \
-        | i370 | i860 | i960 | ia16 | ia64 \
-        | ip2k | iq2000 \
-        | k1om \
-        | le32 | le64 \
-        | lm32 \
-        | m32c | m32r | m32rle | m68000 | m68k | m88k \
-        | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip \
-        | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
-        | mips | mipsbe | mipseb | mipsel | mipsle \
-        | mips16 \
-        | mips64 | mips64el \
-        | mips64octeon | mips64octeonel \
-        | mips64orion | mips64orionel \
-        | mips64r5900 | mips64r5900el \
-        | mips64vr | mips64vrel \
-        | mips64vr4100 | mips64vr4100el \
-        | mips64vr4300 | mips64vr4300el \
-        | mips64vr5000 | mips64vr5000el \
-        | mips64vr5900 | mips64vr5900el \
-        | mipsisa32 | mipsisa32el \
-        | mipsisa32r2 | mipsisa32r2el \
-        | mipsisa32r6 | mipsisa32r6el \
-        | mipsisa64 | mipsisa64el \
-        | mipsisa64r2 | mipsisa64r2el \
-        | mipsisa64r6 | mipsisa64r6el \
-        | mipsisa64sb1 | mipsisa64sb1el \
-        | mipsisa64sr71k | mipsisa64sr71kel \
-        | mipsr5900 | mipsr5900el \
-        | mipstx39 | mipstx39el \
-        | mn10200 | mn10300 \
-        | moxie \
-        | mt \
-        | msp430 \
-        | nds32 | nds32le | nds32be \
-        | nfp \
-        | nios | nios2 | nios2eb | nios2el \
-        | ns16k | ns32k \
-        | open8 | or1k | or1knd | or32 \
-        | pdp10 | pj | pjl \
-        | powerpc | powerpc64 | powerpc64le | powerpcle \
-        | pru \
-        | pyramid \
-        | riscv | riscv32 | riscv64 \
-        | rl78 | rx \
-        | score \
-        | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh[23]ele \
-        | sh64 | sh64le \
-        | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-        | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-        | spu \
-        | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-        | ubicom32 \
-        | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-        | visium \
-        | wasm32 \
-        | x86 | xc16x | xstormy16 | xgate | xtensa \
-        | z8k | z80)
-                basic_machine=$basic_machine-unknown
-                ;;
-        c54x)
-                basic_machine=tic54x-unknown
-                ;;
-        c55x)
-                basic_machine=tic55x-unknown
-                ;;
-        c6x)
-                basic_machine=tic6x-unknown
-                ;;
-        leon|leon[3-9])
-                basic_machine=sparc-$basic_machine
-                ;;
-        m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
-                ;;
-        m9s12z | m68hcs12z | hcs12z | s12z)
-                basic_machine=s12z-unknown
-                ;;
-        m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
-                basic_machine=s12z-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-                ;;
-        ms1)
-                basic_machine=mt-unknown
-                ;;
-        strongarm | thumb | xscale)
-                basic_machine=arm-unknown
-                ;;
-        xscaleeb)
-                basic_machine=armeb-unknown
-                ;;
-
-        xscaleel)
-                basic_machine=armel-unknown
-                ;;
-
-        # We use `pc' rather than `unknown'
-        # because (1) that's what they normally are, and
-        # (2) the word "unknown" tends to confuse beginning users.
-        i*86 | x86_64)
-          basic_machine=$basic_machine-pc
-          ;;
-        # Recognize the basic CPU types with company name.
-        1750a-* | 580-* \
-        | a29k-* \
-        | aarch64-* | aarch64_be-* \
-        | abacus-* \
-        | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-        | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-        | alphapca5[67]-* | alpha64pca5[67]-* \
-        | am33_2.0-* \
-        | arc-* | arceb-* \
-        | arm-*  | arm[lb]e-* | arme[lb]-* | armv*-* \
-        | avr-* | avr32-* \
-        | asmjs-* \
-        | ba-* \
-        | be32-* | be64-* \
-        | bfin-* | bs2000-* \
-        | c[123]* | c30-* | [cjt]90-* | c4x-* \
-        | c8051-* | clipper-* | craynv-* | csky-* | cydra-* \
-        | d10v-* | d30v-* | dlx-* | dsp16xx-* \
-        | e2k-* | elxsi-* | epiphany-* \
-        | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | ft32-* | fx80-* \
-        | h8300-* | h8500-* \
-        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-        | hexagon-* \
-        | i370-* | i*86-* | i860-* | i960-* | ia16-* | ia64-* \
-        | ip2k-* | iq2000-* \
-        | k1om-* \
-        | le32-* | le64-* \
-        | lm32-* \
-        | m32c-* | m32r-* | m32rle-* \
-        | m5200-* | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* | v70-* | w65-* \
-        | m6811-* | m68hc11-* | m6812-* | m68hc12-* | m68hcs12x-* | nvptx-* | picochip-* \
-        | m88110-* | m88k-* | maxq-* | mb-* | mcore-* | mep-* | metag-* \
-        | microblaze-* | microblazeel-* \
-        | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-        | mips16-* \
-        | mips64-* | mips64el-* \
-        | mips64octeon-* | mips64octeonel-* \
-        | mips64orion-* | mips64orionel-* \
-        | mips64r5900-* | mips64r5900el-* \
-        | mips64vr-* | mips64vrel-* \
-        | mips64vr4100-* | mips64vr4100el-* \
-        | mips64vr4300-* | mips64vr4300el-* \
-        | mips64vr5000-* | mips64vr5000el-* \
-        | mips64vr5900-* | mips64vr5900el-* \
-        | mipsisa32-* | mipsisa32el-* \
-        | mipsisa32r2-* | mipsisa32r2el-* \
-        | mipsisa32r6-* | mipsisa32r6el-* \
-        | mipsisa64-* | mipsisa64el-* \
-        | mipsisa64r2-* | mipsisa64r2el-* \
-        | mipsisa64r6-* | mipsisa64r6el-* \
-        | mipsisa64sb1-* | mipsisa64sb1el-* \
-        | mipsisa64sr71k-* | mipsisa64sr71kel-* \
-        | mipsr5900-* | mipsr5900el-* \
-        | mipstx39-* | mipstx39el-* \
-        | mmix-* \
-        | mn10200-* | mn10300-* \
-        | moxie-* \
-        | mt-* \
-        | msp430-* \
-        | nds32-* | nds32le-* | nds32be-* \
-        | nfp-* \
-        | nios-* | nios2-* | nios2eb-* | nios2el-* \
-        | none-* | np1-* | ns16k-* | ns32k-* \
-        | open8-* \
-        | or1k*-* \
-        | or32-* \
-        | orion-* \
-        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
-        | pru-* \
-        | pyramid-* \
-        | riscv-* | riscv32-* | riscv64-* \
-        | rl78-* | romp-* | rs6000-* | rx-* \
-        | score-* \
-        | sh-* | sh[1234]-* | sh[24]a-* | sh[24]ae[lb]-* | sh[23]e-* | she[lb]-* | sh[lb]e-* \
-        | sh[1234]e[lb]-* |  sh[12345][lb]e-* | sh[23]ele-* | sh64-* | sh64le-* \
-        | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-        | sparclite-* \
-        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
-        | spu-* \
-        | tahoe-* \
-        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-        | tron-* \
-        | ubicom32-* \
-        | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-        | vax-* \
-        | visium-* \
-        | wasm32-* \
-        | we32k-* \
-        | x86-* | x86_64-* | xc16x-* | xgate-* | xps100-* \
-        | xstormy16-* | xtensa*-* \
-        | ymp-* \
-        | z8k-* | z80-*)
-                ;;
-        # Recognize the basic CPU types without company name, with glob match.
-        xtensa*)
-                basic_machine=$basic_machine-unknown
-                ;;
         # Recognize the various machine names and aliases which stand
         # for a CPU type and a company and sometimes even an OS.
         3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
@@ -927,12 +710,6 @@ case $basic_machine in
         3b*)
                 basic_machine=we32k-att
                 ;;
-        amd64)
-                basic_machine=x86_64-pc
-                ;;
-        amd64-*)
-                basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-                ;;
         blackfin-*)
                 basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
                 os=linux
@@ -954,20 +731,6 @@ case $basic_machine in
                 basic_machine=c90-cray
                 os=${os:-unicos}
                 ;;
-        cr16 | cr16-*)
-                basic_machine=cr16-unknown
-                os=${os:-elf}
-                ;;
-        crisv32 | crisv32-* | etraxfs*)
-                basic_machine=crisv32-axis
-                ;;
-        cris | cris-* | etrax*)
-                basic_machine=cris-axis
-                ;;
-        crx)
-                basic_machine=crx-unknown
-                os=${os:-elf}
-                ;;
         decsystem10* | dec10*)
                 basic_machine=pdp10-dec
                 os=tops10
@@ -1079,9 +842,6 @@ case $basic_machine in
                 basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
                 os=linux
                 ;;
-        microblaze*)
-                basic_machine=microblaze-xilinx
-                ;;
         miniframe)
                 basic_machine=m68000-convergent
                 ;;
@@ -1118,21 +878,6 @@ case $basic_machine in
         np1)
                 basic_machine=np1-gould
                 ;;
-        neo-tandem)
-                basic_machine=neo-tandem
-                ;;
-        nse-tandem)
-                basic_machine=nse-tandem
-                ;;
-        nsr-tandem)
-                basic_machine=nsr-tandem
-                ;;
-        nsv-tandem)
-                basic_machine=nsv-tandem
-                ;;
-        nsx-tandem)
-                basic_machine=nsx-tandem
-                ;;
         op50n-* | op60c-*)
                 basic_machine=hppa1.1-oki
                 os=proelf
@@ -1157,9 +902,6 @@ case $basic_machine in
         pc532 | pc532-*)
                 basic_machine=ns32k-pc532
                 ;;
-        pc98)
-                basic_machine=i386-pc
-                ;;
         pc98-*)
                 basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
                 ;;
@@ -1222,12 +964,6 @@ case $basic_machine in
         rtpc | rtpc-*)
                 basic_machine=romp-ibm
                 ;;
-        s390 | s390-*)
-                basic_machine=s390-ibm
-                ;;
-        s390x | s390x-*)
-                basic_machine=s390x-ibm
-                ;;
         sb1)
                 basic_machine=mipsisa64sb1-unknown
                 ;;
@@ -1254,12 +990,6 @@ case $basic_machine in
         strongarm-* | thumb-*)
                 basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
                 ;;
-        tile*-*)
-                ;;
-        tile*)
-                basic_machine=$basic_machine-unknown
-                os=${os:-linux-gnu}
-                ;;
         tx39)
                 basic_machine=mipstx39-unknown
                 ;;
@@ -1272,17 +1002,13 @@ case $basic_machine in
         vpp*|vx|vx-*)
                 basic_machine=f301-fujitsu
                 ;;
-        w65*)
+        w65)
                 basic_machine=w65-wdc
-                os=none
                 ;;
         w89k-*)
                 basic_machine=hppa1.1-winbond
                 os=proelf
                 ;;
-        x64)
-                basic_machine=x86_64-pc
-                ;;
         xscale-* | xscalee[bl]-*)
                 basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
                 ;;
@@ -1290,6 +1016,288 @@ case $basic_machine in
                 basic_machine=none-none
                 ;;
 
+        c54x)
+                basic_machine=tic54x-unknown
+                ;;
+        c55x)
+                basic_machine=tic55x-unknown
+                ;;
+        c6x)
+                basic_machine=tic6x-unknown
+                ;;
+        leon | leon[3-9])
+                basic_machine=sparc-$basic_machine
+                ;;
+        m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70)
+                ;;
+        ms1)
+                basic_machine=mt-unknown
+                ;;
+        strongarm | thumb | xscale)
+                basic_machine=arm-unknown
+                ;;
+        xscaleeb)
+                basic_machine=armeb-unknown
+                ;;
+
+        xscaleel)
+                basic_machine=armel-unknown
+                ;;
+
+        # We use `pc' rather than `unknown'
+        # because (1) that's what they normally are, and
+        # (2) the word "unknown" tends to confuse beginning users.
+        i*86 | x86_64)
+                basic_machine=$basic_machine-pc
+                ;;
+        # These rules are duplicated from below for sake of the special case above;
+        # i.e. things that normalized to x86 arches should also default to "pc"
+        pc98)
+                basic_machine=i386-pc
+                ;;
+        x64 | amd64)
+                basic_machine=x86_64-pc
+                ;;
+
+        # Recognize the cannonical CPU Types that limit and/or modify the
+        # company names they are paired with.
+        amd64-*)
+                basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+                ;;
+        cr16)
+                basic_machine=cr16-unknown
+                os=${os:-elf}
+                ;;
+        cr16-*)
+                os=${os:-elf}
+                ;;
+        crisv32 | crisv32-* | etraxfs*)
+                basic_machine=crisv32-axis
+                ;;
+        cris | cris-* | etrax*)
+                basic_machine=cris-axis
+                ;;
+        crx-*)
+                os=${os:-elf}
+                ;;
+        crx)
+                basic_machine=crx-unknown
+                os=${os:-elf}
+                ;;
+        m9s12z | m68hcs12z | hcs12z | s12z)
+                basic_machine=s12z-unknown
+                ;;
+        m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
+                basic_machine=s12z-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+                ;;
+        neo-tandem)
+                basic_machine=neo-tandem
+                ;;
+        nse-tandem)
+                basic_machine=nse-tandem
+                ;;
+        nsr-tandem)
+                basic_machine=nsr-tandem
+                ;;
+        nsv-tandem)
+                basic_machine=nsv-tandem
+                ;;
+        nsx-tandem)
+                basic_machine=nsx-tandem
+                ;;
+        s390 | s390-*)
+                basic_machine=s390-ibm
+                ;;
+        s390x | s390x-*)
+                basic_machine=s390x-ibm
+                ;;
+        tile*-*)
+                os=${os:-linux-gnu}
+                ;;
+        tile*)
+                basic_machine=$basic_machine-unknown
+                os=${os:-linux-gnu}
+                ;;
+
+        # Recognize the cannonical CPU types that are allowed with any
+        # company name.
+        1750a-* | 580-* \
+        | a29k-* \
+        | aarch64-* | aarch64_be-* \
+        | abacus-* \
+        | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+        | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+        | alphapca5[67]-* | alpha64pca5[67]-* \
+        | am33_2.0-* \
+        | arc-* | arceb-* \
+        | arm-*  | arm[lb]e-* | arme[lb]-* | armv*-* \
+        | avr-* | avr32-* \
+        | asmjs-* \
+        | ba-* \
+        | be32-* | be64-* \
+        | bfin-* | bs2000-* \
+        | c[123]* | c30-* | [cjt]90-* | c4x-* \
+        | c8051-* | clipper-* | craynv-* | csky-* | cydra-* \
+        | d10v-* | d30v-* | dlx-* | dsp16xx-* \
+        | e2k-* | elxsi-* | epiphany-* \
+        | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | ft32-* | fx80-* \
+        | h8300-* | h8500-* \
+        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+        | hexagon-* \
+        | i370-* | i*86-* | i860-* | i960-* | ia16-* | ia64-* \
+        | ip2k-* | iq2000-* \
+        | k1om-* \
+        | le32-* | le64-* \
+        | lm32-* \
+        | m32c-* | m32r-* | m32rle-* \
+        | m5200-* | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* | v70-* | w65-* \
+        | m6811-* | m68hc11-* | m6812-* | m68hc12-* | m68hcs12x-* | nvptx-* | picochip-* \
+        | m88110-* | m88k-* | maxq-* | mb-* | mcore-* | mep-* | metag-* \
+        | microblaze-* | microblazeel-* \
+        | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+        | mips16-* \
+        | mips64-* | mips64el-* \
+        | mips64octeon-* | mips64octeonel-* \
+        | mips64orion-* | mips64orionel-* \
+        | mips64r5900-* | mips64r5900el-* \
+        | mips64vr-* | mips64vrel-* \
+        | mips64vr4100-* | mips64vr4100el-* \
+        | mips64vr4300-* | mips64vr4300el-* \
+        | mips64vr5000-* | mips64vr5000el-* \
+        | mips64vr5900-* | mips64vr5900el-* \
+        | mipsisa32-* | mipsisa32el-* \
+        | mipsisa32r2-* | mipsisa32r2el-* \
+        | mipsisa32r6-* | mipsisa32r6el-* \
+        | mipsisa64-* | mipsisa64el-* \
+        | mipsisa64r2-* | mipsisa64r2el-* \
+        | mipsisa64r6-* | mipsisa64r6el-* \
+        | mipsisa64sb1-* | mipsisa64sb1el-* \
+        | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+        | mipsr5900-* | mipsr5900el-* \
+        | mipstx39-* | mipstx39el-* \
+        | mmix-* \
+        | mn10200-* | mn10300-* \
+        | moxie-* \
+        | mt-* \
+        | msp430-* \
+        | nds32-* | nds32le-* | nds32be-* \
+        | nfp-* \
+        | nios-* | nios2-* | nios2eb-* | nios2el-* \
+        | none-* | np1-* | ns16k-* | ns32k-* \
+        | open8-* \
+        | or1k*-* \
+        | or32-* \
+        | orion-* \
+        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | powerpcspe-* \
+        | pru-* \
+        | pyramid-* \
+        | riscv-* | riscv32-* | riscv64-* \
+        | rl78-* | romp-* | rs6000-* | rx-* \
+        | score-* \
+        | sh-* | sh[1234]-* | sh[24]a-* | sh[24]ae[lb]-* | sh[23]e-* | she[lb]-* | sh[lb]e-* \
+        | sh[1234]e[lb]-* |  sh[12345][lb]e-* | sh[23]ele-* | sh64-* | sh64le-* \
+        | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+        | sparclite-* \
+        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
+        | spu-* \
+        | tahoe-* \
+        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+        | tron-* \
+        | ubicom32-* \
+        | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+        | vax-* \
+        | visium-* \
+        | wasm32-* \
+        | we32k-* \
+        | x86-* | x86_64-* | xc16x-* | xgate-* | xps100-* \
+        | xstormy16-* | xtensa*-* \
+        | ymp-* \
+        | z8k-* | z80-*)
+                ;;
+
+        # Recognize the basic CPU types without company name.
+        # Some are omitted here because they have special meanings below.
+        1750a | 580 \
+        | a29k \
+        | aarch64 | aarch64_be \
+        | abacus \
+        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+        | am33_2.0 \
+        | arc | arceb \
+        | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv6m | armv[78][arm] \
+        | avr | avr32 \
+        | asmjs \
+        | ba \
+        | be32 | be64 \
+        | bfin \
+        | c4x | c8051 | clipper | csky \
+        | d10v | d30v | dlx | dsp16xx \
+        | e2k | epiphany \
+        | fido | fr30 | frv | ft32 \
+        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+        | hexagon \
+        | i370 | i860 | i960 | ia16 | ia64 \
+        | ip2k | iq2000 \
+        | k1om \
+        | le32 | le64 \
+        | lm32 \
+        | m32c | m32r | m32rle | m68000 | m68k | m88k \
+        | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip \
+        | maxq | mb | mcore | mep | metag \
+        | mips | mipsbe | mipseb | mipsel | mipsle \
+        | mips16 \
+        | mips64 | mips64el \
+        | mips64octeon | mips64octeonel \
+        | mips64orion | mips64orionel \
+        | mips64r5900 | mips64r5900el \
+        | mips64vr | mips64vrel \
+        | mips64vr4100 | mips64vr4100el \
+        | mips64vr4300 | mips64vr4300el \
+        | mips64vr5000 | mips64vr5000el \
+        | mips64vr5900 | mips64vr5900el \
+        | mipsisa32 | mipsisa32el \
+        | mipsisa32r2 | mipsisa32r2el \
+        | mipsisa32r6 | mipsisa32r6el \
+        | mipsisa64 | mipsisa64el \
+        | mipsisa64r2 | mipsisa64r2el \
+        | mipsisa64r6 | mipsisa64r6el \
+        | mipsisa64sb1 | mipsisa64sb1el \
+        | mipsisa64sr71k | mipsisa64sr71kel \
+        | mipsr5900 | mipsr5900el \
+        | mipstx39 | mipstx39el \
+        | mn10200 | mn10300 \
+        | moxie \
+        | mt \
+        | msp430 \
+        | nds32 | nds32le | nds32be \
+        | nfp \
+        | nios | nios2 | nios2eb | nios2el \
+        | ns16k | ns32k \
+        | open8 | or1k | or1knd | or32 \
+        | pdp10 | pj | pjl \
+        | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
+        | pru \
+        | pyramid \
+        | riscv | riscv32 | riscv64 \
+        | rl78 | rx \
+        | score \
+        | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh[23]ele \
+        | sh64 | sh64le \
+        | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+        | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+        | spu \
+        | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+        | ubicom32 \
+        | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+        | visium \
+        | wasm32 \
+        | x86 | xc16x | xstormy16 | xgate | xtensa* \
+        | z8k | z80)
+                basic_machine=$basic_machine-unknown
+                ;;
+
         *)
                 echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
                 exit 1
diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in
index 666105b74bb..2e265b3068b 100644
--- a/lib/gnulib.mk.in
+++ b/lib/gnulib.mk.in
@@ -303,6 +303,7 @@ GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
 GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
+GNULIB_GETPASS = @GNULIB_GETPASS@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
 GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
@@ -548,6 +549,7 @@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
 HAVE_GETLOGIN = @HAVE_GETLOGIN@
 HAVE_GETOPT_H = @HAVE_GETOPT_H@
 HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
+HAVE_GETPASS = @HAVE_GETPASS@
 HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
 HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
 HAVE_GRANTPT = @HAVE_GRANTPT@
@@ -854,6 +856,7 @@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
 REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
+REPLACE_GETPASS = @REPLACE_GETPASS@
 REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
 REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ISATTY = @REPLACE_ISATTY@
@@ -3098,6 +3101,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \
               -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \
               -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \
+              -e 's/@''GNULIB_GETPASS''@/$(GNULIB_GETPASS)/g' \
               -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \
               -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \
               -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \
@@ -3141,6 +3145,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \
               -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \
               -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \
+              -e 's|@''HAVE_GETPASS''@|$(HAVE_GETPASS)|g' \
               -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \
               -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \
               -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \
@@ -3184,6 +3189,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \
               -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \
               -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
+              -e 's|@''REPLACE_GETPASS''@|$(REPLACE_GETPASS)|g' \
               -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \
               -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
               -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \
diff --git a/lib/intprops.h b/lib/intprops.h
index 15e470cbc6e..3d6b3cf4d9b 100644
--- a/lib/intprops.h
+++ b/lib/intprops.h
@@ -22,12 +22,13 @@
 
 #include <limits.h>
 
-/* Return a value with the common real type of E and V and the value of V.  */
-#define _GL_INT_CONVERT(e, v) (0 * (e) + (v))
+/* Return a value with the common real type of E and V and the value of V.
+   Do not evaluate E.  */
+#define _GL_INT_CONVERT(e, v) ((1 ? 0 : (e)) + (v))
 
 /* Act like _GL_INT_CONVERT (E, -V) but work around a bug in IRIX 6.5 cc; see
    <https://lists.gnu.org/r/bug-gnulib/2011-05/msg00406.html>.  */
-#define _GL_INT_NEGATE_CONVERT(e, v) (0 * (e) - (v))
+#define _GL_INT_NEGATE_CONVERT(e, v) ((1 ? 0 : (e)) - (v))
 
 /* The extra casts in the following macros work around compiler bugs,
    e.g., in Cray C 5.0.3.0.  */
@@ -40,13 +41,14 @@
 #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
 
 /* Return 1 if the real expression E, after promotion, has a
-   signed or floating type.  */
+   signed or floating type.  Do not evaluate E.  */
 #define EXPR_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0)
 
 
 /* Minimum and maximum values for integer types and expressions.  */
 
 /* The width in bits of the integer type or expression T.
+   Do not evaluate T.
    Padding bits are not supported; this is checked at compile-time below.  */
 #define TYPE_WIDTH(t) (sizeof (t) * CHAR_BIT)
 
@@ -58,7 +60,7 @@
         : ((((t) 1 << (TYPE_WIDTH (t) - 2)) - 1) * 2 + 1)))
 
 /* The maximum and minimum values for the type of the expression E,
-   after integer promotion.  E should not have side effects.  */
+   after integer promotion.  E is not evaluated.  */
 #define _GL_INT_MINIMUM(e)                                              \
   (EXPR_SIGNED (e)                                                      \
    ? ~ _GL_SIGNED_INT_MAXIMUM (e)                                       \
@@ -340,8 +342,8 @@
    Arguments should be free of side effects.  */
 #define _GL_BINARY_OP_OVERFLOW(a, b, op_result_overflow)        \
   op_result_overflow (a, b,                                     \
-                      _GL_INT_MINIMUM (0 * (b) + (a)),          \
-                      _GL_INT_MAXIMUM (0 * (b) + (a)))
+                      _GL_INT_MINIMUM ((1 ? 0 : (b)) + (a)),    \
+                      _GL_INT_MAXIMUM ((1 ? 0 : (b)) + (a)))
 
 /* Store the low-order bits of A + B, A - B, A * B, respectively, into *R.
    Return 1 if the result overflows.  See above for restrictions.  */
diff --git a/lib/regex_internal.c b/lib/regex_internal.c
index 32373565e6d..e3ce4abfa6b 100644
--- a/lib/regex_internal.c
+++ b/lib/regex_internal.c
@@ -317,7 +317,7 @@ build_wcs_upper_buffer (re_string_t *pstr)
           mbclen = __mbrtowc (&wc,
                               ((const char *) pstr->raw_mbs + pstr->raw_mbs_idx
                                + byte_idx), remain_len, &pstr->cur_state);
-          if (BE (mbclen < (size_t) -2, 1))
+          if (BE (0 < mbclen && mbclen < (size_t) -2, 1))
             {
               wchar_t wcu = __towupper (wc);
               if (wcu != wc)
@@ -386,7 +386,7 @@ build_wcs_upper_buffer (re_string_t *pstr)
         else
           p = (const char *) pstr->raw_mbs + pstr->raw_mbs_idx + src_idx;
         mbclen = __mbrtowc (&wc, p, remain_len, &pstr->cur_state);
-        if (BE (mbclen < (size_t) -2, 1))
+        if (BE (0 < mbclen && mbclen < (size_t) -2, 1))
           {
             wchar_t wcu = __towupper (wc);
             if (wcu != wc)
diff --git a/lib/regex_internal.h b/lib/regex_internal.h
index 7bbe802bc53..dd0900b719f 100644
--- a/lib/regex_internal.h
+++ b/lib/regex_internal.h
@@ -149,7 +149,10 @@
 /* Rename to standard API for using out of glibc.  */
 #ifndef _LIBC
 # undef __wctype
+# undef __iswalnum
 # undef __iswctype
+# undef __towlower
+# undef __towupper
 # define __wctype wctype
 # define __iswalnum iswalnum
 # define __iswctype iswctype
diff --git a/lib/unistd.in.h b/lib/unistd.in.h
index 55bbb6ca3b7..66f254d60f5 100644
--- a/lib/unistd.in.h
+++ b/lib/unistd.in.h
@@ -935,6 +935,36 @@ _GL_WARN_ON_USE (getpagesize, "getpagesize is unportable - "
 #endif
 
 
+#if @GNULIB_GETPASS@
+/* Function getpass() from module 'getpass':
+     Read a password from /dev/tty or stdin.
+   Function getpass() from module 'getpass-gnu':
+     Read a password of arbitrary length from /dev/tty or stdin.  */
+# if @REPLACE_GETPASS@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef getpass
+#   define getpass rpl_getpass
+#  endif
+_GL_FUNCDECL_RPL (getpass, char *, (const char *prompt)
+                                   _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (getpass, char *, (const char *prompt));
+# else
+#  if !@HAVE_GETPASS@
+_GL_FUNCDECL_SYS (getpass, char *, (const char *prompt)
+                                   _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (getpass, char *, (const char *prompt));
+# endif
+_GL_CXXALIASWARN (getpass);
+#elif defined GNULIB_POSIXCHECK
+# undef getpass
+# if HAVE_RAW_DECL_GETPASS
+_GL_WARN_ON_USE (getpass, "getpass is unportable - "
+                 "use gnulib module getpass or getpass-gnu for portability");
+# endif
+#endif
+
+
 #if @GNULIB_GETUSERSHELL@
 /* Return the next valid login shell on the system, or NULL when the end of
    the list has been reached.  */
diff --git a/m4/limits-h.m4 b/m4/limits-h.m4
index 511dcef5e04..83886634396 100644
--- a/m4/limits-h.m4
+++ b/m4/limits-h.m4
@@ -29,3 +29,11 @@ AC_DEFUN_ONCE([gl_LIMITS_H],
   AC_SUBST([LIMITS_H])
   AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"])
 ])
+
+dnl Unconditionally enables the replacement of <limits.h>.
+AC_DEFUN([gl_REPLACE_LIMITS_H],
+[
+  AC_REQUIRE([gl_LIMITS_H])
+  LIMITS_H='limits.h'
+  AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"])
+])
diff --git a/m4/stdint.m4 b/m4/stdint.m4
index b86184c2ea6..38dbbedffec 100644
--- a/m4/stdint.m4
+++ b/m4/stdint.m4
@@ -1,4 +1,4 @@
-# stdint.m4 serial 51
+# stdint.m4 serial 52
 dnl Copyright (C) 2001-2018 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -364,8 +364,7 @@ int32_t i32 = INT32_C (0x7fffffff);
   esac
 
   dnl The substitute stdint.h needs the substitute limit.h's _GL_INTEGER_WIDTH.
-  LIMITS_H=limits.h
-  AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"])
+  gl_REPLACE_LIMITS_H
 
   AC_SUBST([HAVE_C99_STDINT_H])
   AC_SUBST([HAVE_SYS_BITYPES_H])
diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4
index 159c48aeef1..3ba64da8a0b 100644
--- a/m4/unistd_h.m4
+++ b/m4/unistd_h.m4
@@ -1,4 +1,4 @@
-# unistd_h.m4 serial 73
+# unistd_h.m4 serial 74
 dnl Copyright (C) 2006-2018 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -43,7 +43,7 @@ AC_DEFUN([gl_UNISTD_H],
 #endif
     ]], [chdir chown dup dup2 dup3 environ euidaccess faccessat fchdir fchownat
     fdatasync fsync ftruncate getcwd getdomainname getdtablesize getgroups
-    gethostname getlogin getlogin_r getpagesize
+    gethostname getlogin getlogin_r getpagesize getpass
     getusershell setusershell endusershell
     group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite
     readlink readlinkat rmdir sethostname sleep symlink symlinkat
@@ -83,6 +83,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
   GNULIB_GETLOGIN=0;             AC_SUBST([GNULIB_GETLOGIN])
   GNULIB_GETLOGIN_R=0;           AC_SUBST([GNULIB_GETLOGIN_R])
   GNULIB_GETPAGESIZE=0;          AC_SUBST([GNULIB_GETPAGESIZE])
+  GNULIB_GETPASS=0;              AC_SUBST([GNULIB_GETPASS])
   GNULIB_GETUSERSHELL=0;         AC_SUBST([GNULIB_GETUSERSHELL])
   GNULIB_GROUP_MEMBER=0;         AC_SUBST([GNULIB_GROUP_MEMBER])
   GNULIB_ISATTY=0;               AC_SUBST([GNULIB_ISATTY])
@@ -126,6 +127,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
   HAVE_GETHOSTNAME=1;     AC_SUBST([HAVE_GETHOSTNAME])
   HAVE_GETLOGIN=1;        AC_SUBST([HAVE_GETLOGIN])
   HAVE_GETPAGESIZE=1;     AC_SUBST([HAVE_GETPAGESIZE])
+  HAVE_GETPASS=1;         AC_SUBST([HAVE_GETPASS])
   HAVE_GROUP_MEMBER=1;    AC_SUBST([HAVE_GROUP_MEMBER])
   HAVE_LCHOWN=1;          AC_SUBST([HAVE_LCHOWN])
   HAVE_LINK=1;            AC_SUBST([HAVE_LINK])
@@ -168,6 +170,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
   REPLACE_GETLOGIN_R=0;   AC_SUBST([REPLACE_GETLOGIN_R])
   REPLACE_GETGROUPS=0;    AC_SUBST([REPLACE_GETGROUPS])
   REPLACE_GETPAGESIZE=0;  AC_SUBST([REPLACE_GETPAGESIZE])
+  REPLACE_GETPASS=0;      AC_SUBST([REPLACE_GETPASS])
   REPLACE_ISATTY=0;       AC_SUBST([REPLACE_ISATTY])
   REPLACE_LCHOWN=0;       AC_SUBST([REPLACE_LCHOWN])
   REPLACE_LINK=0;         AC_SUBST([REPLACE_LINK])