aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2018-02-01 09:20:13 -0800
committerPaul Eggert2018-02-01 09:21:39 -0800
commit100e33979b139c007c45f0fd339a76e5a7ef494a (patch)
tree79fb78ba700ac9ccecb4cf4e1133871a74fbf1c8
parentc85d9e401a686637284752a0eadc52f7a6b439d7 (diff)
downloademacs-100e33979b139c007c45f0fd339a76e5a7ef494a.tar.gz
emacs-100e33979b139c007c45f0fd339a76e5a7ef494a.zip
Update from gnulib
This includes: 2018-01-31 environ: Fix link error on 64-bit Cygwin 2018-01-27 Fix malfunction of socket functions on HP-UX in 64-bit mode 2018-01-26 manywarnings: fix maintainer comment 2018-01-23 Merge strftime.c changes from glibc * build-aux/config.guess, build-aux/config.sub, doc/misc/texinfo.tex: * lib/gnulib.mk.in, lib/nstrftime.c, lib/unistd.in.h, m4/extensions.m4: * m4/manywarnings.m4: Update.
Diffstat
-rwxr-xr-xbuild-aux/config.guess478
-rwxr-xr-xbuild-aux/config.sub198
-rw-r--r--doc/misc/texinfo.tex46
-rw-r--r--lib/gnulib.mk.in1
-rw-r--r--lib/nstrftime.c24
-rw-r--r--lib/unistd.in.h7
-rw-r--r--m4/extensions.m48
-rw-r--r--m4/manywarnings.m42
8 files changed, 396 insertions, 368 deletions
diff --git a/build-aux/config.guess b/build-aux/config.guess
index ba28704cd61..9baaa270bfc 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -1,8 +1,8 @@
1#! /bin/sh 1#! /bin/sh
2# Attempt to guess a canonical system name. 2# Attempt to guess a canonical system name.
3# Copyright 1992-2017 Free Software Foundation, Inc. 3# Copyright 1992-2018 Free Software Foundation, Inc.
4 4
5timestamp='2018-01-01' 5timestamp='2018-01-26'
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
@@ -107,9 +107,9 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
107dummy=$tmp/dummy ; 107dummy=$tmp/dummy ;
108tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; 108tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
109case $CC_FOR_BUILD,$HOST_CC,$CC in 109case $CC_FOR_BUILD,$HOST_CC,$CC in
110 ,,) echo "int x;" > $dummy.c ; 110 ,,) echo "int x;" > "$dummy.c" ;
111 for c in cc gcc c89 c99 ; do 111 for c in cc gcc c89 c99 ; do
112 if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then 112 if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
113 CC_FOR_BUILD="$c"; break ; 113 CC_FOR_BUILD="$c"; break ;
114 fi ; 114 fi ;
115 done ; 115 done ;
@@ -132,14 +132,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
132UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown 132UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
133UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown 133UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
134 134
135case "${UNAME_SYSTEM}" in 135case "$UNAME_SYSTEM" in
136Linux|GNU|GNU/*) 136Linux|GNU|GNU/*)
137 # If the system lacks a compiler, then just pick glibc. 137 # If the system lacks a compiler, then just pick glibc.
138 # We could probably try harder. 138 # We could probably try harder.
139 LIBC=gnu 139 LIBC=gnu
140 140
141 eval $set_cc_for_build 141 eval "$set_cc_for_build"
142 cat <<-EOF > $dummy.c 142 cat <<-EOF > "$dummy.c"
143 #include <features.h> 143 #include <features.h>
144 #if defined(__UCLIBC__) 144 #if defined(__UCLIBC__)
145 LIBC=uclibc 145 LIBC=uclibc
@@ -149,13 +149,20 @@ Linux|GNU|GNU/*)
149 LIBC=gnu 149 LIBC=gnu
150 #endif 150 #endif
151 EOF 151 EOF
152 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` 152 eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
153
154 # If ldd exists, use it to detect musl libc.
155 if command -v ldd >/dev/null && \
156 ldd --version 2>&1 | grep -q ^musl
157 then
158 LIBC=musl
159 fi
153 ;; 160 ;;
154esac 161esac
155 162
156# Note: order is significant - the case branches are not exclusive. 163# Note: order is significant - the case branches are not exclusive.
157 164
158case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in 165case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
159 *:NetBSD:*:*) 166 *:NetBSD:*:*)
160 # NetBSD (nbsd) targets should (where applicable) match one or 167 # NetBSD (nbsd) targets should (where applicable) match one or
161 # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, 168 # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
@@ -169,30 +176,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
169 # portion of the name. We always set it to "unknown". 176 # portion of the name. We always set it to "unknown".
170 sysctl="sysctl -n hw.machine_arch" 177 sysctl="sysctl -n hw.machine_arch"
171 UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ 178 UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
172 /sbin/$sysctl 2>/dev/null || \ 179 "/sbin/$sysctl" 2>/dev/null || \
173 /usr/sbin/$sysctl 2>/dev/null || \ 180 "/usr/sbin/$sysctl" 2>/dev/null || \
174 echo unknown)` 181 echo unknown)`
175 case "${UNAME_MACHINE_ARCH}" in 182 case "$UNAME_MACHINE_ARCH" in
176 armeb) machine=armeb-unknown ;; 183 armeb) machine=armeb-unknown ;;
177 arm*) machine=arm-unknown ;; 184 arm*) machine=arm-unknown ;;
178 sh3el) machine=shl-unknown ;; 185 sh3el) machine=shl-unknown ;;
179 sh3eb) machine=sh-unknown ;; 186 sh3eb) machine=sh-unknown ;;
180 sh5el) machine=sh5le-unknown ;; 187 sh5el) machine=sh5le-unknown ;;
181 earmv*) 188 earmv*)
182 arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` 189 arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
183 endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` 190 endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
184 machine=${arch}${endian}-unknown 191 machine="${arch}${endian}"-unknown
185 ;; 192 ;;
186 *) machine=${UNAME_MACHINE_ARCH}-unknown ;; 193 *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
187 esac 194 esac
188 # The Operating System including object format, if it has switched 195 # The Operating System including object format, if it has switched
189 # to ELF recently (or will in the future) and ABI. 196 # to ELF recently (or will in the future) and ABI.
190 case "${UNAME_MACHINE_ARCH}" in 197 case "$UNAME_MACHINE_ARCH" in
191 earm*) 198 earm*)
192 os=netbsdelf 199 os=netbsdelf
193 ;; 200 ;;
194 arm*|i386|m68k|ns32k|sh3*|sparc|vax) 201 arm*|i386|m68k|ns32k|sh3*|sparc|vax)
195 eval $set_cc_for_build 202 eval "$set_cc_for_build"
196 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ 203 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
197 | grep -q __ELF__ 204 | grep -q __ELF__
198 then 205 then
@@ -208,10 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
208 ;; 215 ;;
209 esac 216 esac
210 # Determine ABI tags. 217 # Determine ABI tags.
211 case "${UNAME_MACHINE_ARCH}" in 218 case "$UNAME_MACHINE_ARCH" in
212 earm*) 219 earm*)
213 expr='s/^earmv[0-9]/-eabi/;s/eb$//' 220 expr='s/^earmv[0-9]/-eabi/;s/eb$//'
214 abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` 221 abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
215 ;; 222 ;;
216 esac 223 esac
217 # The OS release 224 # The OS release
@@ -219,51 +226,51 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
219 # thus, need a distinct triplet. However, they do not need 226 # thus, need a distinct triplet. However, they do not need
220 # kernel version information, so it can be replaced with a 227 # kernel version information, so it can be replaced with a
221 # suitable tag, in the style of linux-gnu. 228 # suitable tag, in the style of linux-gnu.
222 case "${UNAME_VERSION}" in 229 case "$UNAME_VERSION" in
223 Debian*) 230 Debian*)
224 release='-gnu' 231 release='-gnu'
225 ;; 232 ;;
226 *) 233 *)
227 release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` 234 release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
228 ;; 235 ;;
229 esac 236 esac
230 # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: 237 # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
231 # contains redundant information, the shorter form: 238 # contains redundant information, the shorter form:
232 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. 239 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
233 echo "${machine}-${os}${release}${abi}" 240 echo "$machine-${os}${release}${abi}"
234 exit ;; 241 exit ;;
235 *:Bitrig:*:*) 242 *:Bitrig:*:*)
236 UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` 243 UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
237 echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} 244 echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
238 exit ;; 245 exit ;;
239 *:OpenBSD:*:*) 246 *:OpenBSD:*:*)
240 UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` 247 UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
241 echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} 248 echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
242 exit ;; 249 exit ;;
243 *:LibertyBSD:*:*) 250 *:LibertyBSD:*:*)
244 UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` 251 UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
245 echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} 252 echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
246 exit ;; 253 exit ;;
247 *:MidnightBSD:*:*) 254 *:MidnightBSD:*:*)
248 echo ${UNAME_MACHINE}-unknown-midnightbsd${UNAME_RELEASE} 255 echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
249 exit ;; 256 exit ;;
250 *:ekkoBSD:*:*) 257 *:ekkoBSD:*:*)
251 echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} 258 echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
252 exit ;; 259 exit ;;
253 *:SolidBSD:*:*) 260 *:SolidBSD:*:*)
254 echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} 261 echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
255 exit ;; 262 exit ;;
256 macppc:MirBSD:*:*) 263 macppc:MirBSD:*:*)
257 echo powerpc-unknown-mirbsd${UNAME_RELEASE} 264 echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
258 exit ;; 265 exit ;;
259 *:MirBSD:*:*) 266 *:MirBSD:*:*)
260 echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} 267 echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
261 exit ;; 268 exit ;;
262 *:Sortix:*:*) 269 *:Sortix:*:*)
263 echo ${UNAME_MACHINE}-unknown-sortix 270 echo "$UNAME_MACHINE"-unknown-sortix
264 exit ;; 271 exit ;;
265 *:Redox:*:*) 272 *:Redox:*:*)
266 echo ${UNAME_MACHINE}-unknown-redox 273 echo "$UNAME_MACHINE"-unknown-redox
267 exit ;; 274 exit ;;
268 mips:OSF1:*.*) 275 mips:OSF1:*.*)
269 echo mips-dec-osf1 276 echo mips-dec-osf1
@@ -319,7 +326,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
319 # A Tn.n version is a released field test version. 326 # A Tn.n version is a released field test version.
320 # A Xn.n version is an unreleased experimental baselevel. 327 # A Xn.n version is an unreleased experimental baselevel.
321 # 1.2 uses "1.2" for uname -r. 328 # 1.2 uses "1.2" for uname -r.
322 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` 329 echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
323 # Reset EXIT trap before exiting to avoid spurious non-zero exit code. 330 # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
324 exitcode=$? 331 exitcode=$?
325 trap '' 0 332 trap '' 0
@@ -328,10 +335,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
328 echo m68k-unknown-sysv4 335 echo m68k-unknown-sysv4
329 exit ;; 336 exit ;;
330 *:[Aa]miga[Oo][Ss]:*:*) 337 *:[Aa]miga[Oo][Ss]:*:*)
331 echo ${UNAME_MACHINE}-unknown-amigaos 338 echo "$UNAME_MACHINE"-unknown-amigaos
332 exit ;; 339 exit ;;
333 *:[Mm]orph[Oo][Ss]:*:*) 340 *:[Mm]orph[Oo][Ss]:*:*)
334 echo ${UNAME_MACHINE}-unknown-morphos 341 echo "$UNAME_MACHINE"-unknown-morphos
335 exit ;; 342 exit ;;
336 *:OS/390:*:*) 343 *:OS/390:*:*)
337 echo i370-ibm-openedition 344 echo i370-ibm-openedition
@@ -343,7 +350,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
343 echo powerpc-ibm-os400 350 echo powerpc-ibm-os400
344 exit ;; 351 exit ;;
345 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) 352 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
346 echo arm-acorn-riscix${UNAME_RELEASE} 353 echo arm-acorn-riscix"$UNAME_RELEASE"
347 exit ;; 354 exit ;;
348 arm*:riscos:*:*|arm*:RISCOS:*:*) 355 arm*:riscos:*:*|arm*:RISCOS:*:*)
349 echo arm-unknown-riscos 356 echo arm-unknown-riscos
@@ -370,19 +377,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
370 sparc) echo sparc-icl-nx7; exit ;; 377 sparc) echo sparc-icl-nx7; exit ;;
371 esac ;; 378 esac ;;
372 s390x:SunOS:*:*) 379 s390x:SunOS:*:*)
373 echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 380 echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
374 exit ;; 381 exit ;;
375 sun4H:SunOS:5.*:*) 382 sun4H:SunOS:5.*:*)
376 echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 383 echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
377 exit ;; 384 exit ;;
378 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) 385 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
379 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 386 echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
380 exit ;; 387 exit ;;
381 i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) 388 i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
382 echo i386-pc-auroraux${UNAME_RELEASE} 389 echo i386-pc-auroraux"$UNAME_RELEASE"
383 exit ;; 390 exit ;;
384 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) 391 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
385 eval $set_cc_for_build 392 eval "$set_cc_for_build"
386 SUN_ARCH=i386 393 SUN_ARCH=i386
387 # If there is a compiler, see if it is configured for 64-bit objects. 394 # If there is a compiler, see if it is configured for 64-bit objects.
388 # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. 395 # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
@@ -395,13 +402,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
395 SUN_ARCH=x86_64 402 SUN_ARCH=x86_64
396 fi 403 fi
397 fi 404 fi
398 echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 405 echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
399 exit ;; 406 exit ;;
400 sun4*:SunOS:6*:*) 407 sun4*:SunOS:6*:*)
401 # According to config.sub, this is the proper way to canonicalize 408 # According to config.sub, this is the proper way to canonicalize
402 # SunOS6. Hard to guess exactly what SunOS6 will be like, but 409 # SunOS6. Hard to guess exactly what SunOS6 will be like, but
403 # it's likely to be more like Solaris than SunOS4. 410 # it's likely to be more like Solaris than SunOS4.
404 echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 411 echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
405 exit ;; 412 exit ;;
406 sun4*:SunOS:*:*) 413 sun4*:SunOS:*:*)
407 case "`/usr/bin/arch -k`" in 414 case "`/usr/bin/arch -k`" in
@@ -410,25 +417,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
410 ;; 417 ;;
411 esac 418 esac
412 # Japanese Language versions have a version number like `4.1.3-JL'. 419 # Japanese Language versions have a version number like `4.1.3-JL'.
413 echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` 420 echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
414 exit ;; 421 exit ;;
415 sun3*:SunOS:*:*) 422 sun3*:SunOS:*:*)
416 echo m68k-sun-sunos${UNAME_RELEASE} 423 echo m68k-sun-sunos"$UNAME_RELEASE"
417 exit ;; 424 exit ;;
418 sun*:*:4.2BSD:*) 425 sun*:*:4.2BSD:*)
419 UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` 426 UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
420 test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 427 test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
421 case "`/bin/arch`" in 428 case "`/bin/arch`" in
422 sun3) 429 sun3)
423 echo m68k-sun-sunos${UNAME_RELEASE} 430 echo m68k-sun-sunos"$UNAME_RELEASE"
424 ;; 431 ;;
425 sun4) 432 sun4)
426 echo sparc-sun-sunos${UNAME_RELEASE} 433 echo sparc-sun-sunos"$UNAME_RELEASE"
427 ;; 434 ;;
428 esac 435 esac
429 exit ;; 436 exit ;;
430 aushp:SunOS:*:*) 437 aushp:SunOS:*:*)
431 echo sparc-auspex-sunos${UNAME_RELEASE} 438 echo sparc-auspex-sunos"$UNAME_RELEASE"
432 exit ;; 439 exit ;;
433 # The situation for MiNT is a little confusing. The machine name 440 # The situation for MiNT is a little confusing. The machine name
434 # can be virtually everything (everything which is not 441 # can be virtually everything (everything which is not
@@ -439,44 +446,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
439 # MiNT. But MiNT is downward compatible to TOS, so this should 446 # MiNT. But MiNT is downward compatible to TOS, so this should
440 # be no problem. 447 # be no problem.
441 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) 448 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
442 echo m68k-atari-mint${UNAME_RELEASE} 449 echo m68k-atari-mint"$UNAME_RELEASE"
443 exit ;; 450 exit ;;
444 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) 451 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
445 echo m68k-atari-mint${UNAME_RELEASE} 452 echo m68k-atari-mint"$UNAME_RELEASE"
446 exit ;; 453 exit ;;
447 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) 454 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
448 echo m68k-atari-mint${UNAME_RELEASE} 455 echo m68k-atari-mint"$UNAME_RELEASE"
449 exit ;; 456 exit ;;
450 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) 457 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
451 echo m68k-milan-mint${UNAME_RELEASE} 458 echo m68k-milan-mint"$UNAME_RELEASE"
452 exit ;; 459 exit ;;
453 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) 460 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
454 echo m68k-hades-mint${UNAME_RELEASE} 461 echo m68k-hades-mint"$UNAME_RELEASE"
455 exit ;; 462 exit ;;
456 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) 463 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
457 echo m68k-unknown-mint${UNAME_RELEASE} 464 echo m68k-unknown-mint"$UNAME_RELEASE"
458 exit ;; 465 exit ;;
459 m68k:machten:*:*) 466 m68k:machten:*:*)
460 echo m68k-apple-machten${UNAME_RELEASE} 467 echo m68k-apple-machten"$UNAME_RELEASE"
461 exit ;; 468 exit ;;
462 powerpc:machten:*:*) 469 powerpc:machten:*:*)
463 echo powerpc-apple-machten${UNAME_RELEASE} 470 echo powerpc-apple-machten"$UNAME_RELEASE"
464 exit ;; 471 exit ;;
465 RISC*:Mach:*:*) 472 RISC*:Mach:*:*)
466 echo mips-dec-mach_bsd4.3 473 echo mips-dec-mach_bsd4.3
467 exit ;; 474 exit ;;
468 RISC*:ULTRIX:*:*) 475 RISC*:ULTRIX:*:*)
469 echo mips-dec-ultrix${UNAME_RELEASE} 476 echo mips-dec-ultrix"$UNAME_RELEASE"
470 exit ;; 477 exit ;;
471 VAX*:ULTRIX*:*:*) 478 VAX*:ULTRIX*:*:*)
472 echo vax-dec-ultrix${UNAME_RELEASE} 479 echo vax-dec-ultrix"$UNAME_RELEASE"
473 exit ;; 480 exit ;;
474 2020:CLIX:*:* | 2430:CLIX:*:*) 481 2020:CLIX:*:* | 2430:CLIX:*:*)
475 echo clipper-intergraph-clix${UNAME_RELEASE} 482 echo clipper-intergraph-clix"$UNAME_RELEASE"
476 exit ;; 483 exit ;;
477 mips:*:*:UMIPS | mips:*:*:RISCos) 484 mips:*:*:UMIPS | mips:*:*:RISCos)
478 eval $set_cc_for_build 485 eval "$set_cc_for_build"
479 sed 's/^ //' << EOF >$dummy.c 486 sed 's/^ //' << EOF > "$dummy.c"
480#ifdef __cplusplus 487#ifdef __cplusplus
481#include <stdio.h> /* for printf() prototype */ 488#include <stdio.h> /* for printf() prototype */
482 int main (int argc, char *argv[]) { 489 int main (int argc, char *argv[]) {
@@ -497,11 +504,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
497 exit (-1); 504 exit (-1);
498 } 505 }
499EOF 506EOF
500 $CC_FOR_BUILD -o $dummy $dummy.c && 507 $CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
501 dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && 508 dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
502 SYSTEM_NAME=`$dummy $dummyarg` && 509 SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
503 { echo "$SYSTEM_NAME"; exit; } 510 { echo "$SYSTEM_NAME"; exit; }
504 echo mips-mips-riscos${UNAME_RELEASE} 511 echo mips-mips-riscos"$UNAME_RELEASE"
505 exit ;; 512 exit ;;
506 Motorola:PowerMAX_OS:*:*) 513 Motorola:PowerMAX_OS:*:*)
507 echo powerpc-motorola-powermax 514 echo powerpc-motorola-powermax
@@ -527,17 +534,17 @@ EOF
527 AViiON:dgux:*:*) 534 AViiON:dgux:*:*)
528 # DG/UX returns AViiON for all architectures 535 # DG/UX returns AViiON for all architectures
529 UNAME_PROCESSOR=`/usr/bin/uname -p` 536 UNAME_PROCESSOR=`/usr/bin/uname -p`
530 if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] 537 if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
531 then 538 then
532 if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ 539 if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
533 [ ${TARGET_BINARY_INTERFACE}x = x ] 540 [ "$TARGET_BINARY_INTERFACE"x = x ]
534 then 541 then
535 echo m88k-dg-dgux${UNAME_RELEASE} 542 echo m88k-dg-dgux"$UNAME_RELEASE"
536 else 543 else
537 echo m88k-dg-dguxbcs${UNAME_RELEASE} 544 echo m88k-dg-dguxbcs"$UNAME_RELEASE"
538 fi 545 fi
539 else 546 else
540 echo i586-dg-dgux${UNAME_RELEASE} 547 echo i586-dg-dgux"$UNAME_RELEASE"
541 fi 548 fi
542 exit ;; 549 exit ;;
543 M88*:DolphinOS:*:*) # DolphinOS (SVR3) 550 M88*:DolphinOS:*:*) # DolphinOS (SVR3)
@@ -554,7 +561,7 @@ EOF
554 echo m68k-tektronix-bsd 561 echo m68k-tektronix-bsd
555 exit ;; 562 exit ;;
556 *:IRIX*:*:*) 563 *:IRIX*:*:*)
557 echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` 564 echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
558 exit ;; 565 exit ;;
559 ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. 566 ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
560 echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id 567 echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
@@ -566,14 +573,14 @@ EOF
566 if [ -x /usr/bin/oslevel ] ; then 573 if [ -x /usr/bin/oslevel ] ; then
567 IBM_REV=`/usr/bin/oslevel` 574 IBM_REV=`/usr/bin/oslevel`
568 else 575 else
569 IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} 576 IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
570 fi 577 fi
571 echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} 578 echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
572 exit ;; 579 exit ;;
573 *:AIX:2:3) 580 *:AIX:2:3)
574 if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then 581 if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
575 eval $set_cc_for_build 582 eval "$set_cc_for_build"
576 sed 's/^ //' << EOF >$dummy.c 583 sed 's/^ //' << EOF > "$dummy.c"
577 #include <sys/systemcfg.h> 584 #include <sys/systemcfg.h>
578 585
579 main() 586 main()
@@ -584,7 +591,7 @@ EOF
584 exit(0); 591 exit(0);
585 } 592 }
586EOF 593EOF
587 if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` 594 if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
588 then 595 then
589 echo "$SYSTEM_NAME" 596 echo "$SYSTEM_NAME"
590 else 597 else
@@ -598,7 +605,7 @@ EOF
598 exit ;; 605 exit ;;
599 *:AIX:*:[4567]) 606 *:AIX:*:[4567])
600 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` 607 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
601 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then 608 if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
602 IBM_ARCH=rs6000 609 IBM_ARCH=rs6000
603 else 610 else
604 IBM_ARCH=powerpc 611 IBM_ARCH=powerpc
@@ -607,9 +614,9 @@ EOF
607 IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | 614 IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
608 awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` 615 awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
609 else 616 else
610 IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} 617 IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
611 fi 618 fi
612 echo ${IBM_ARCH}-ibm-aix${IBM_REV} 619 echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
613 exit ;; 620 exit ;;
614 *:AIX:*:*) 621 *:AIX:*:*)
615 echo rs6000-ibm-aix 622 echo rs6000-ibm-aix
@@ -618,7 +625,7 @@ EOF
618 echo romp-ibm-bsd4.4 625 echo romp-ibm-bsd4.4
619 exit ;; 626 exit ;;
620 ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and 627 ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
621 echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to 628 echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to
622 exit ;; # report: romp-ibm BSD 4.3 629 exit ;; # report: romp-ibm BSD 4.3
623 *:BOSX:*:*) 630 *:BOSX:*:*)
624 echo rs6000-bull-bosx 631 echo rs6000-bull-bosx
@@ -633,28 +640,28 @@ EOF
633 echo m68k-hp-bsd4.4 640 echo m68k-hp-bsd4.4
634 exit ;; 641 exit ;;
635 9000/[34678]??:HP-UX:*:*) 642 9000/[34678]??:HP-UX:*:*)
636 HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` 643 HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
637 case "${UNAME_MACHINE}" in 644 case "$UNAME_MACHINE" in
638 9000/31?) HP_ARCH=m68000 ;; 645 9000/31?) HP_ARCH=m68000 ;;
639 9000/[34]??) HP_ARCH=m68k ;; 646 9000/[34]??) HP_ARCH=m68k ;;
640 9000/[678][0-9][0-9]) 647 9000/[678][0-9][0-9])
641 if [ -x /usr/bin/getconf ]; then 648 if [ -x /usr/bin/getconf ]; then
642 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` 649 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
643 sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` 650 sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
644 case "${sc_cpu_version}" in 651 case "$sc_cpu_version" in
645 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 652 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
646 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 653 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
647 532) # CPU_PA_RISC2_0 654 532) # CPU_PA_RISC2_0
648 case "${sc_kernel_bits}" in 655 case "$sc_kernel_bits" in
649 32) HP_ARCH=hppa2.0n ;; 656 32) HP_ARCH=hppa2.0n ;;
650 64) HP_ARCH=hppa2.0w ;; 657 64) HP_ARCH=hppa2.0w ;;
651 '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 658 '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
652 esac ;; 659 esac ;;
653 esac 660 esac
654 fi 661 fi
655 if [ "${HP_ARCH}" = "" ]; then 662 if [ "$HP_ARCH" = "" ]; then
656 eval $set_cc_for_build 663 eval "$set_cc_for_build"
657 sed 's/^ //' << EOF >$dummy.c 664 sed 's/^ //' << EOF > "$dummy.c"
658 665
659 #define _HPUX_SOURCE 666 #define _HPUX_SOURCE
660 #include <stdlib.h> 667 #include <stdlib.h>
@@ -687,13 +694,13 @@ EOF
687 exit (0); 694 exit (0);
688 } 695 }
689EOF 696EOF
690 (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` 697 (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
691 test -z "$HP_ARCH" && HP_ARCH=hppa 698 test -z "$HP_ARCH" && HP_ARCH=hppa
692 fi ;; 699 fi ;;
693 esac 700 esac
694 if [ ${HP_ARCH} = hppa2.0w ] 701 if [ "$HP_ARCH" = hppa2.0w ]
695 then 702 then
696 eval $set_cc_for_build 703 eval "$set_cc_for_build"
697 704
698 # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating 705 # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
699 # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler 706 # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
@@ -712,15 +719,15 @@ EOF
712 HP_ARCH=hppa64 719 HP_ARCH=hppa64
713 fi 720 fi
714 fi 721 fi
715 echo ${HP_ARCH}-hp-hpux${HPUX_REV} 722 echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
716 exit ;; 723 exit ;;
717 ia64:HP-UX:*:*) 724 ia64:HP-UX:*:*)
718 HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` 725 HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
719 echo ia64-hp-hpux${HPUX_REV} 726 echo ia64-hp-hpux"$HPUX_REV"
720 exit ;; 727 exit ;;
721 3050*:HI-UX:*:*) 728 3050*:HI-UX:*:*)
722 eval $set_cc_for_build 729 eval "$set_cc_for_build"
723 sed 's/^ //' << EOF >$dummy.c 730 sed 's/^ //' << EOF > "$dummy.c"
724 #include <unistd.h> 731 #include <unistd.h>
725 int 732 int
726 main () 733 main ()
@@ -745,7 +752,7 @@ EOF
745 exit (0); 752 exit (0);
746 } 753 }
747EOF 754EOF
748 $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && 755 $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
749 { echo "$SYSTEM_NAME"; exit; } 756 { echo "$SYSTEM_NAME"; exit; }
750 echo unknown-hitachi-hiuxwe2 757 echo unknown-hitachi-hiuxwe2
751 exit ;; 758 exit ;;
@@ -766,9 +773,9 @@ EOF
766 exit ;; 773 exit ;;
767 i*86:OSF1:*:*) 774 i*86:OSF1:*:*)
768 if [ -x /usr/sbin/sysversion ] ; then 775 if [ -x /usr/sbin/sysversion ] ; then
769 echo ${UNAME_MACHINE}-unknown-osf1mk 776 echo "$UNAME_MACHINE"-unknown-osf1mk
770 else 777 else
771 echo ${UNAME_MACHINE}-unknown-osf1 778 echo "$UNAME_MACHINE"-unknown-osf1
772 fi 779 fi
773 exit ;; 780 exit ;;
774 parisc*:Lites*:*:*) 781 parisc*:Lites*:*:*)
@@ -793,109 +800,109 @@ EOF
793 echo c4-convex-bsd 800 echo c4-convex-bsd
794 exit ;; 801 exit ;;
795 CRAY*Y-MP:*:*:*) 802 CRAY*Y-MP:*:*:*)
796 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 803 echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
797 exit ;; 804 exit ;;
798 CRAY*[A-Z]90:*:*:*) 805 CRAY*[A-Z]90:*:*:*)
799 echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ 806 echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
800 | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ 807 | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
801 -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ 808 -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
802 -e 's/\.[^.]*$/.X/' 809 -e 's/\.[^.]*$/.X/'
803 exit ;; 810 exit ;;
804 CRAY*TS:*:*:*) 811 CRAY*TS:*:*:*)
805 echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 812 echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
806 exit ;; 813 exit ;;
807 CRAY*T3E:*:*:*) 814 CRAY*T3E:*:*:*)
808 echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 815 echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
809 exit ;; 816 exit ;;
810 CRAY*SV1:*:*:*) 817 CRAY*SV1:*:*:*)
811 echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 818 echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
812 exit ;; 819 exit ;;
813 *:UNICOS/mp:*:*) 820 *:UNICOS/mp:*:*)
814 echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 821 echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
815 exit ;; 822 exit ;;
816 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) 823 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
817 FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` 824 FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
818 FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` 825 FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
819 FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` 826 FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
820 echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 827 echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
821 exit ;; 828 exit ;;
822 5000:UNIX_System_V:4.*:*) 829 5000:UNIX_System_V:4.*:*)
823 FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` 830 FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
824 FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` 831 FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
825 echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 832 echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
826 exit ;; 833 exit ;;
827 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) 834 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
828 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} 835 echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
829 exit ;; 836 exit ;;
830 sparc*:BSD/OS:*:*) 837 sparc*:BSD/OS:*:*)
831 echo sparc-unknown-bsdi${UNAME_RELEASE} 838 echo sparc-unknown-bsdi"$UNAME_RELEASE"
832 exit ;; 839 exit ;;
833 *:BSD/OS:*:*) 840 *:BSD/OS:*:*)
834 echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} 841 echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
835 exit ;; 842 exit ;;
836 *:FreeBSD:*:*) 843 *:FreeBSD:*:*)
837 UNAME_PROCESSOR=`/usr/bin/uname -p` 844 UNAME_PROCESSOR=`/usr/bin/uname -p`
838 case ${UNAME_PROCESSOR} in 845 case "$UNAME_PROCESSOR" in
839 amd64) 846 amd64)
840 UNAME_PROCESSOR=x86_64 ;; 847 UNAME_PROCESSOR=x86_64 ;;
841 i386) 848 i386)
842 UNAME_PROCESSOR=i586 ;; 849 UNAME_PROCESSOR=i586 ;;
843 esac 850 esac
844 echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` 851 echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
845 exit ;; 852 exit ;;
846 i*:CYGWIN*:*) 853 i*:CYGWIN*:*)
847 echo ${UNAME_MACHINE}-pc-cygwin 854 echo "$UNAME_MACHINE"-pc-cygwin
848 exit ;; 855 exit ;;
849 *:MINGW64*:*) 856 *:MINGW64*:*)
850 echo ${UNAME_MACHINE}-pc-mingw64 857 echo "$UNAME_MACHINE"-pc-mingw64
851 exit ;; 858 exit ;;
852 *:MINGW*:*) 859 *:MINGW*:*)
853 echo ${UNAME_MACHINE}-pc-mingw32 860 echo "$UNAME_MACHINE"-pc-mingw32
854 exit ;; 861 exit ;;
855 *:MSYS*:*) 862 *:MSYS*:*)
856 echo ${UNAME_MACHINE}-pc-msys 863 echo "$UNAME_MACHINE"-pc-msys
857 exit ;; 864 exit ;;
858 i*:PW*:*) 865 i*:PW*:*)
859 echo ${UNAME_MACHINE}-pc-pw32 866 echo "$UNAME_MACHINE"-pc-pw32
860 exit ;; 867 exit ;;
861 *:Interix*:*) 868 *:Interix*:*)
862 case ${UNAME_MACHINE} in 869 case "$UNAME_MACHINE" in
863 x86) 870 x86)
864 echo i586-pc-interix${UNAME_RELEASE} 871 echo i586-pc-interix"$UNAME_RELEASE"
865 exit ;; 872 exit ;;
866 authenticamd | genuineintel | EM64T) 873 authenticamd | genuineintel | EM64T)
867 echo x86_64-unknown-interix${UNAME_RELEASE} 874 echo x86_64-unknown-interix"$UNAME_RELEASE"
868 exit ;; 875 exit ;;
869 IA64) 876 IA64)
870 echo ia64-unknown-interix${UNAME_RELEASE} 877 echo ia64-unknown-interix"$UNAME_RELEASE"
871 exit ;; 878 exit ;;
872 esac ;; 879 esac ;;
873 i*:UWIN*:*) 880 i*:UWIN*:*)
874 echo ${UNAME_MACHINE}-pc-uwin 881 echo "$UNAME_MACHINE"-pc-uwin
875 exit ;; 882 exit ;;
876 amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) 883 amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
877 echo x86_64-unknown-cygwin 884 echo x86_64-unknown-cygwin
878 exit ;; 885 exit ;;
879 prep*:SunOS:5.*:*) 886 prep*:SunOS:5.*:*)
880 echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 887 echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
881 exit ;; 888 exit ;;
882 *:GNU:*:*) 889 *:GNU:*:*)
883 # the GNU system 890 # the GNU system
884 echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` 891 echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
885 exit ;; 892 exit ;;
886 *:GNU/*:*:*) 893 *:GNU/*:*:*)
887 # other systems with GNU libc and userland 894 # other systems with GNU libc and userland
888 echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} 895 echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
889 exit ;; 896 exit ;;
890 i*86:Minix:*:*) 897 i*86:Minix:*:*)
891 echo ${UNAME_MACHINE}-pc-minix 898 echo "$UNAME_MACHINE"-pc-minix
892 exit ;; 899 exit ;;
893 aarch64:Linux:*:*) 900 aarch64:Linux:*:*)
894 echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 901 echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
895 exit ;; 902 exit ;;
896 aarch64_be:Linux:*:*) 903 aarch64_be:Linux:*:*)
897 UNAME_MACHINE=aarch64_be 904 UNAME_MACHINE=aarch64_be
898 echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 905 echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
899 exit ;; 906 exit ;;
900 alpha:Linux:*:*) 907 alpha:Linux:*:*)
901 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in 908 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -909,63 +916,63 @@ EOF
909 esac 916 esac
910 objdump --private-headers /bin/sh | grep -q ld.so.1 917 objdump --private-headers /bin/sh | grep -q ld.so.1
911 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi 918 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
912 echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 919 echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
913 exit ;; 920 exit ;;
914 arc:Linux:*:* | arceb:Linux:*:*) 921 arc:Linux:*:* | arceb:Linux:*:*)
915 echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 922 echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
916 exit ;; 923 exit ;;
917 arm*:Linux:*:*) 924 arm*:Linux:*:*)
918 eval $set_cc_for_build 925 eval "$set_cc_for_build"
919 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ 926 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
920 | grep -q __ARM_EABI__ 927 | grep -q __ARM_EABI__
921 then 928 then
922 echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 929 echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
923 else 930 else
924 if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ 931 if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
925 | grep -q __ARM_PCS_VFP 932 | grep -q __ARM_PCS_VFP
926 then 933 then
927 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi 934 echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
928 else 935 else
929 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf 936 echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
930 fi 937 fi
931 fi 938 fi
932 exit ;; 939 exit ;;
933 avr32*:Linux:*:*) 940 avr32*:Linux:*:*)
934 echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 941 echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
935 exit ;; 942 exit ;;
936 cris:Linux:*:*) 943 cris:Linux:*:*)
937 echo ${UNAME_MACHINE}-axis-linux-${LIBC} 944 echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
938 exit ;; 945 exit ;;
939 crisv32:Linux:*:*) 946 crisv32:Linux:*:*)
940 echo ${UNAME_MACHINE}-axis-linux-${LIBC} 947 echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
941 exit ;; 948 exit ;;
942 e2k:Linux:*:*) 949 e2k:Linux:*:*)
943 echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 950 echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
944 exit ;; 951 exit ;;
945 frv:Linux:*:*) 952 frv:Linux:*:*)
946 echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 953 echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
947 exit ;; 954 exit ;;
948 hexagon:Linux:*:*) 955 hexagon:Linux:*:*)
949 echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 956 echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
950 exit ;; 957 exit ;;
951 i*86:Linux:*:*) 958 i*86:Linux:*:*)
952 echo ${UNAME_MACHINE}-pc-linux-${LIBC} 959 echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
953 exit ;; 960 exit ;;
954 ia64:Linux:*:*) 961 ia64:Linux:*:*)
955 echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 962 echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
956 exit ;; 963 exit ;;
957 k1om:Linux:*:*) 964 k1om:Linux:*:*)
958 echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 965 echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
959 exit ;; 966 exit ;;
960 m32r*:Linux:*:*) 967 m32r*:Linux:*:*)
961 echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 968 echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
962 exit ;; 969 exit ;;
963 m68*:Linux:*:*) 970 m68*:Linux:*:*)
964 echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 971 echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
965 exit ;; 972 exit ;;
966 mips:Linux:*:* | mips64:Linux:*:*) 973 mips:Linux:*:* | mips64:Linux:*:*)
967 eval $set_cc_for_build 974 eval "$set_cc_for_build"
968 sed 's/^ //' << EOF >$dummy.c 975 sed 's/^ //' << EOF > "$dummy.c"
969 #undef CPU 976 #undef CPU
970 #undef ${UNAME_MACHINE} 977 #undef ${UNAME_MACHINE}
971 #undef ${UNAME_MACHINE}el 978 #undef ${UNAME_MACHINE}el
@@ -979,70 +986,70 @@ EOF
979 #endif 986 #endif
980 #endif 987 #endif
981EOF 988EOF
982 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` 989 eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
983 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } 990 test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
984 ;; 991 ;;
985 mips64el:Linux:*:*) 992 mips64el:Linux:*:*)
986 echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 993 echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
987 exit ;; 994 exit ;;
988 openrisc*:Linux:*:*) 995 openrisc*:Linux:*:*)
989 echo or1k-unknown-linux-${LIBC} 996 echo or1k-unknown-linux-"$LIBC"
990 exit ;; 997 exit ;;
991 or32:Linux:*:* | or1k*:Linux:*:*) 998 or32:Linux:*:* | or1k*:Linux:*:*)
992 echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 999 echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
993 exit ;; 1000 exit ;;
994 padre:Linux:*:*) 1001 padre:Linux:*:*)
995 echo sparc-unknown-linux-${LIBC} 1002 echo sparc-unknown-linux-"$LIBC"
996 exit ;; 1003 exit ;;
997 parisc64:Linux:*:* | hppa64:Linux:*:*) 1004 parisc64:Linux:*:* | hppa64:Linux:*:*)
998 echo hppa64-unknown-linux-${LIBC} 1005 echo hppa64-unknown-linux-"$LIBC"
999 exit ;; 1006 exit ;;
1000 parisc:Linux:*:* | hppa:Linux:*:*) 1007 parisc:Linux:*:* | hppa:Linux:*:*)
1001 # Look for CPU level 1008 # Look for CPU level
1002 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in 1009 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
1003 PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; 1010 PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
1004 PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; 1011 PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
1005 *) echo hppa-unknown-linux-${LIBC} ;; 1012 *) echo hppa-unknown-linux-"$LIBC" ;;
1006 esac 1013 esac
1007 exit ;; 1014 exit ;;
1008 ppc64:Linux:*:*) 1015 ppc64:Linux:*:*)
1009 echo powerpc64-unknown-linux-${LIBC} 1016 echo powerpc64-unknown-linux-"$LIBC"
1010 exit ;; 1017 exit ;;
1011 ppc:Linux:*:*) 1018 ppc:Linux:*:*)
1012 echo powerpc-unknown-linux-${LIBC} 1019 echo powerpc-unknown-linux-"$LIBC"
1013 exit ;; 1020 exit ;;
1014 ppc64le:Linux:*:*) 1021 ppc64le:Linux:*:*)
1015 echo powerpc64le-unknown-linux-${LIBC} 1022 echo powerpc64le-unknown-linux-"$LIBC"
1016 exit ;; 1023 exit ;;
1017 ppcle:Linux:*:*) 1024 ppcle:Linux:*:*)
1018 echo powerpcle-unknown-linux-${LIBC} 1025 echo powerpcle-unknown-linux-"$LIBC"
1019 exit ;; 1026 exit ;;
1020 riscv32:Linux:*:* | riscv64:Linux:*:*) 1027 riscv32:Linux:*:* | riscv64:Linux:*:*)
1021 echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 1028 echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1022 exit ;; 1029 exit ;;
1023 s390:Linux:*:* | s390x:Linux:*:*) 1030 s390:Linux:*:* | s390x:Linux:*:*)
1024 echo ${UNAME_MACHINE}-ibm-linux-${LIBC} 1031 echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
1025 exit ;; 1032 exit ;;
1026 sh64*:Linux:*:*) 1033 sh64*:Linux:*:*)
1027 echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 1034 echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1028 exit ;; 1035 exit ;;
1029 sh*:Linux:*:*) 1036 sh*:Linux:*:*)
1030 echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 1037 echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1031 exit ;; 1038 exit ;;
1032 sparc:Linux:*:* | sparc64:Linux:*:*) 1039 sparc:Linux:*:* | sparc64:Linux:*:*)
1033 echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 1040 echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1034 exit ;; 1041 exit ;;
1035 tile*:Linux:*:*) 1042 tile*:Linux:*:*)
1036 echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 1043 echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1037 exit ;; 1044 exit ;;
1038 vax:Linux:*:*) 1045 vax:Linux:*:*)
1039 echo ${UNAME_MACHINE}-dec-linux-${LIBC} 1046 echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
1040 exit ;; 1047 exit ;;
1041 x86_64:Linux:*:*) 1048 x86_64:Linux:*:*)
1042 echo ${UNAME_MACHINE}-pc-linux-${LIBC} 1049 echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
1043 exit ;; 1050 exit ;;
1044 xtensa*:Linux:*:*) 1051 xtensa*:Linux:*:*)
1045 echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 1052 echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1046 exit ;; 1053 exit ;;
1047 i*86:DYNIX/ptx:4*:*) 1054 i*86:DYNIX/ptx:4*:*)
1048 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. 1055 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1056,34 +1063,34 @@ EOF
1056 # I am not positive that other SVR4 systems won't match this, 1063 # I am not positive that other SVR4 systems won't match this,
1057 # I just have to hope. -- rms. 1064 # I just have to hope. -- rms.
1058 # Use sysv4.2uw... so that sysv4* matches it. 1065 # Use sysv4.2uw... so that sysv4* matches it.
1059 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} 1066 echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
1060 exit ;; 1067 exit ;;
1061 i*86:OS/2:*:*) 1068 i*86:OS/2:*:*)
1062 # If we were able to find `uname', then EMX Unix compatibility 1069 # If we were able to find `uname', then EMX Unix compatibility
1063 # is probably installed. 1070 # is probably installed.
1064 echo ${UNAME_MACHINE}-pc-os2-emx 1071 echo "$UNAME_MACHINE"-pc-os2-emx
1065 exit ;; 1072 exit ;;
1066 i*86:XTS-300:*:STOP) 1073 i*86:XTS-300:*:STOP)
1067 echo ${UNAME_MACHINE}-unknown-stop 1074 echo "$UNAME_MACHINE"-unknown-stop
1068 exit ;; 1075 exit ;;
1069 i*86:atheos:*:*) 1076 i*86:atheos:*:*)
1070 echo ${UNAME_MACHINE}-unknown-atheos 1077 echo "$UNAME_MACHINE"-unknown-atheos
1071 exit ;; 1078 exit ;;
1072 i*86:syllable:*:*) 1079 i*86:syllable:*:*)
1073 echo ${UNAME_MACHINE}-pc-syllable 1080 echo "$UNAME_MACHINE"-pc-syllable
1074 exit ;; 1081 exit ;;
1075 i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) 1082 i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
1076 echo i386-unknown-lynxos${UNAME_RELEASE} 1083 echo i386-unknown-lynxos"$UNAME_RELEASE"
1077 exit ;; 1084 exit ;;
1078 i*86:*DOS:*:*) 1085 i*86:*DOS:*:*)
1079 echo ${UNAME_MACHINE}-pc-msdosdjgpp 1086 echo "$UNAME_MACHINE"-pc-msdosdjgpp
1080 exit ;; 1087 exit ;;
1081 i*86:*:4.*:*) 1088 i*86:*:4.*:*)
1082 UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` 1089 UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
1083 if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then 1090 if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
1084 echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} 1091 echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
1085 else 1092 else
1086 echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} 1093 echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
1087 fi 1094 fi
1088 exit ;; 1095 exit ;;
1089 i*86:*:5:[678]*) 1096 i*86:*:5:[678]*)
@@ -1093,12 +1100,12 @@ EOF
1093 *Pentium) UNAME_MACHINE=i586 ;; 1100 *Pentium) UNAME_MACHINE=i586 ;;
1094 *Pent*|*Celeron) UNAME_MACHINE=i686 ;; 1101 *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
1095 esac 1102 esac
1096 echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} 1103 echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
1097 exit ;; 1104 exit ;;
1098 i*86:*:3.2:*) 1105 i*86:*:3.2:*)
1099 if test -f /usr/options/cb.name; then 1106 if test -f /usr/options/cb.name; then
1100 UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` 1107 UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
1101 echo ${UNAME_MACHINE}-pc-isc$UNAME_REL 1108 echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
1102 elif /bin/uname -X 2>/dev/null >/dev/null ; then 1109 elif /bin/uname -X 2>/dev/null >/dev/null ; then
1103 UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` 1110 UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
1104 (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 1111 (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
@@ -1108,9 +1115,9 @@ EOF
1108 && UNAME_MACHINE=i686 1115 && UNAME_MACHINE=i686
1109 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ 1116 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
1110 && UNAME_MACHINE=i686 1117 && UNAME_MACHINE=i686
1111 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL 1118 echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
1112 else 1119 else
1113 echo ${UNAME_MACHINE}-pc-sysv32 1120 echo "$UNAME_MACHINE"-pc-sysv32
1114 fi 1121 fi
1115 exit ;; 1122 exit ;;
1116 pc:*:*:*) 1123 pc:*:*:*)
@@ -1130,9 +1137,9 @@ EOF
1130 exit ;; 1137 exit ;;
1131 i860:*:4.*:*) # i860-SVR4 1138 i860:*:4.*:*) # i860-SVR4
1132 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then 1139 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
1133 echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 1140 echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
1134 else # Add other i860-SVR4 vendors below as they are discovered. 1141 else # Add other i860-SVR4 vendors below as they are discovered.
1135 echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 1142 echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4
1136 fi 1143 fi
1137 exit ;; 1144 exit ;;
1138 mini*:CTIX:SYS*5:*) 1145 mini*:CTIX:SYS*5:*)
@@ -1152,9 +1159,9 @@ EOF
1152 test -r /etc/.relid \ 1159 test -r /etc/.relid \
1153 && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` 1160 && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1154 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ 1161 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1155 && { echo i486-ncr-sysv4.3${OS_REL}; exit; } 1162 && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
1156 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ 1163 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1157 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 1164 && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
1158 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) 1165 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
1159 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ 1166 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1160 && { echo i486-ncr-sysv4; exit; } ;; 1167 && { echo i486-ncr-sysv4; exit; } ;;
@@ -1163,28 +1170,28 @@ EOF
1163 test -r /etc/.relid \ 1170 test -r /etc/.relid \
1164 && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` 1171 && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1165 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ 1172 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1166 && { echo i486-ncr-sysv4.3${OS_REL}; exit; } 1173 && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
1167 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ 1174 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1168 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } 1175 && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
1169 /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ 1176 /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
1170 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 1177 && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
1171 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) 1178 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
1172 echo m68k-unknown-lynxos${UNAME_RELEASE} 1179 echo m68k-unknown-lynxos"$UNAME_RELEASE"
1173 exit ;; 1180 exit ;;
1174 mc68030:UNIX_System_V:4.*:*) 1181 mc68030:UNIX_System_V:4.*:*)
1175 echo m68k-atari-sysv4 1182 echo m68k-atari-sysv4
1176 exit ;; 1183 exit ;;
1177 TSUNAMI:LynxOS:2.*:*) 1184 TSUNAMI:LynxOS:2.*:*)
1178 echo sparc-unknown-lynxos${UNAME_RELEASE} 1185 echo sparc-unknown-lynxos"$UNAME_RELEASE"
1179 exit ;; 1186 exit ;;
1180 rs6000:LynxOS:2.*:*) 1187 rs6000:LynxOS:2.*:*)
1181 echo rs6000-unknown-lynxos${UNAME_RELEASE} 1188 echo rs6000-unknown-lynxos"$UNAME_RELEASE"
1182 exit ;; 1189 exit ;;
1183 PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) 1190 PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
1184 echo powerpc-unknown-lynxos${UNAME_RELEASE} 1191 echo powerpc-unknown-lynxos"$UNAME_RELEASE"
1185 exit ;; 1192 exit ;;
1186 SM[BE]S:UNIX_SV:*:*) 1193 SM[BE]S:UNIX_SV:*:*)
1187 echo mips-dde-sysv${UNAME_RELEASE} 1194 echo mips-dde-sysv"$UNAME_RELEASE"
1188 exit ;; 1195 exit ;;
1189 RM*:ReliantUNIX-*:*:*) 1196 RM*:ReliantUNIX-*:*:*)
1190 echo mips-sni-sysv4 1197 echo mips-sni-sysv4
@@ -1195,7 +1202,7 @@ EOF
1195 *:SINIX-*:*:*) 1202 *:SINIX-*:*:*)
1196 if uname -p 2>/dev/null >/dev/null ; then 1203 if uname -p 2>/dev/null >/dev/null ; then
1197 UNAME_MACHINE=`(uname -p) 2>/dev/null` 1204 UNAME_MACHINE=`(uname -p) 2>/dev/null`
1198 echo ${UNAME_MACHINE}-sni-sysv4 1205 echo "$UNAME_MACHINE"-sni-sysv4
1199 else 1206 else
1200 echo ns32k-sni-sysv 1207 echo ns32k-sni-sysv
1201 fi 1208 fi
@@ -1215,23 +1222,23 @@ EOF
1215 exit ;; 1222 exit ;;
1216 i*86:VOS:*:*) 1223 i*86:VOS:*:*)
1217 # From Paul.Green@stratus.com. 1224 # From Paul.Green@stratus.com.
1218 echo ${UNAME_MACHINE}-stratus-vos 1225 echo "$UNAME_MACHINE"-stratus-vos
1219 exit ;; 1226 exit ;;
1220 *:VOS:*:*) 1227 *:VOS:*:*)
1221 # From Paul.Green@stratus.com. 1228 # From Paul.Green@stratus.com.
1222 echo hppa1.1-stratus-vos 1229 echo hppa1.1-stratus-vos
1223 exit ;; 1230 exit ;;
1224 mc68*:A/UX:*:*) 1231 mc68*:A/UX:*:*)
1225 echo m68k-apple-aux${UNAME_RELEASE} 1232 echo m68k-apple-aux"$UNAME_RELEASE"
1226 exit ;; 1233 exit ;;
1227 news*:NEWS-OS:6*:*) 1234 news*:NEWS-OS:6*:*)
1228 echo mips-sony-newsos6 1235 echo mips-sony-newsos6
1229 exit ;; 1236 exit ;;
1230 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) 1237 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
1231 if [ -d /usr/nec ]; then 1238 if [ -d /usr/nec ]; then
1232 echo mips-nec-sysv${UNAME_RELEASE} 1239 echo mips-nec-sysv"$UNAME_RELEASE"
1233 else 1240 else
1234 echo mips-unknown-sysv${UNAME_RELEASE} 1241 echo mips-unknown-sysv"$UNAME_RELEASE"
1235 fi 1242 fi
1236 exit ;; 1243 exit ;;
1237 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. 1244 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
@@ -1250,39 +1257,39 @@ EOF
1250 echo x86_64-unknown-haiku 1257 echo x86_64-unknown-haiku
1251 exit ;; 1258 exit ;;
1252 SX-4:SUPER-UX:*:*) 1259 SX-4:SUPER-UX:*:*)
1253 echo sx4-nec-superux${UNAME_RELEASE} 1260 echo sx4-nec-superux"$UNAME_RELEASE"
1254 exit ;; 1261 exit ;;
1255 SX-5:SUPER-UX:*:*) 1262 SX-5:SUPER-UX:*:*)
1256 echo sx5-nec-superux${UNAME_RELEASE} 1263 echo sx5-nec-superux"$UNAME_RELEASE"
1257 exit ;; 1264 exit ;;
1258 SX-6:SUPER-UX:*:*) 1265 SX-6:SUPER-UX:*:*)
1259 echo sx6-nec-superux${UNAME_RELEASE} 1266 echo sx6-nec-superux"$UNAME_RELEASE"
1260 exit ;; 1267 exit ;;
1261 SX-7:SUPER-UX:*:*) 1268 SX-7:SUPER-UX:*:*)
1262 echo sx7-nec-superux${UNAME_RELEASE} 1269 echo sx7-nec-superux"$UNAME_RELEASE"
1263 exit ;; 1270 exit ;;
1264 SX-8:SUPER-UX:*:*) 1271 SX-8:SUPER-UX:*:*)
1265 echo sx8-nec-superux${UNAME_RELEASE} 1272 echo sx8-nec-superux"$UNAME_RELEASE"
1266 exit ;; 1273 exit ;;
1267 SX-8R:SUPER-UX:*:*) 1274 SX-8R:SUPER-UX:*:*)
1268 echo sx8r-nec-superux${UNAME_RELEASE} 1275 echo sx8r-nec-superux"$UNAME_RELEASE"
1269 exit ;; 1276 exit ;;
1270 SX-ACE:SUPER-UX:*:*) 1277 SX-ACE:SUPER-UX:*:*)
1271 echo sxace-nec-superux${UNAME_RELEASE} 1278 echo sxace-nec-superux"$UNAME_RELEASE"
1272 exit ;; 1279 exit ;;
1273 Power*:Rhapsody:*:*) 1280 Power*:Rhapsody:*:*)
1274 echo powerpc-apple-rhapsody${UNAME_RELEASE} 1281 echo powerpc-apple-rhapsody"$UNAME_RELEASE"
1275 exit ;; 1282 exit ;;
1276 *:Rhapsody:*:*) 1283 *:Rhapsody:*:*)
1277 echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} 1284 echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
1278 exit ;; 1285 exit ;;
1279 *:Darwin:*:*) 1286 *:Darwin:*:*)
1280 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown 1287 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1281 eval $set_cc_for_build 1288 eval "$set_cc_for_build"
1282 if test "$UNAME_PROCESSOR" = unknown ; then 1289 if test "$UNAME_PROCESSOR" = unknown ; then
1283 UNAME_PROCESSOR=powerpc 1290 UNAME_PROCESSOR=powerpc
1284 fi 1291 fi
1285 if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then 1292 if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
1286 if [ "$CC_FOR_BUILD" != no_compiler_found ]; then 1293 if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
1287 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ 1294 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1288 (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ 1295 (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
@@ -1310,7 +1317,7 @@ EOF
1310 # that Apple uses in portable devices. 1317 # that Apple uses in portable devices.
1311 UNAME_PROCESSOR=x86_64 1318 UNAME_PROCESSOR=x86_64
1312 fi 1319 fi
1313 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} 1320 echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
1314 exit ;; 1321 exit ;;
1315 *:procnto*:*:* | *:QNX:[0123456789]*:*) 1322 *:procnto*:*:* | *:QNX:[0123456789]*:*)
1316 UNAME_PROCESSOR=`uname -p` 1323 UNAME_PROCESSOR=`uname -p`
@@ -1318,22 +1325,25 @@ EOF
1318 UNAME_PROCESSOR=i386 1325 UNAME_PROCESSOR=i386
1319 UNAME_MACHINE=pc 1326 UNAME_MACHINE=pc
1320 fi 1327 fi
1321 echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} 1328 echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
1322 exit ;; 1329 exit ;;
1323 *:QNX:*:4*) 1330 *:QNX:*:4*)
1324 echo i386-pc-qnx 1331 echo i386-pc-qnx
1325 exit ;; 1332 exit ;;
1326 NEO-*:NONSTOP_KERNEL:*:*) 1333 NEO-*:NONSTOP_KERNEL:*:*)
1327 echo neo-tandem-nsk${UNAME_RELEASE} 1334 echo neo-tandem-nsk"$UNAME_RELEASE"
1328 exit ;; 1335 exit ;;
1329 NSE-*:NONSTOP_KERNEL:*:*) 1336 NSE-*:NONSTOP_KERNEL:*:*)
1330 echo nse-tandem-nsk${UNAME_RELEASE} 1337 echo nse-tandem-nsk"$UNAME_RELEASE"
1331 exit ;; 1338 exit ;;
1332 NSR-*:NONSTOP_KERNEL:*:*) 1339 NSR-*:NONSTOP_KERNEL:*:*)
1333 echo nsr-tandem-nsk${UNAME_RELEASE} 1340 echo nsr-tandem-nsk"$UNAME_RELEASE"
1341 exit ;;
1342 NSV-*:NONSTOP_KERNEL:*:*)
1343 echo nsv-tandem-nsk"$UNAME_RELEASE"
1334 exit ;; 1344 exit ;;
1335 NSX-*:NONSTOP_KERNEL:*:*) 1345 NSX-*:NONSTOP_KERNEL:*:*)
1336 echo nsx-tandem-nsk${UNAME_RELEASE} 1346 echo nsx-tandem-nsk"$UNAME_RELEASE"
1337 exit ;; 1347 exit ;;
1338 *:NonStop-UX:*:*) 1348 *:NonStop-UX:*:*)
1339 echo mips-compaq-nonstopux 1349 echo mips-compaq-nonstopux
@@ -1342,7 +1352,7 @@ EOF
1342 echo bs2000-siemens-sysv 1352 echo bs2000-siemens-sysv
1343 exit ;; 1353 exit ;;
1344 DS/*:UNIX_System_V:*:*) 1354 DS/*:UNIX_System_V:*:*)
1345 echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} 1355 echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
1346 exit ;; 1356 exit ;;
1347 *:Plan9:*:*) 1357 *:Plan9:*:*)
1348 # "uname -m" is not consistent, so use $cputype instead. 386 1358 # "uname -m" is not consistent, so use $cputype instead. 386
@@ -1353,7 +1363,7 @@ EOF
1353 else 1363 else
1354 UNAME_MACHINE="$cputype" 1364 UNAME_MACHINE="$cputype"
1355 fi 1365 fi
1356 echo ${UNAME_MACHINE}-unknown-plan9 1366 echo "$UNAME_MACHINE"-unknown-plan9
1357 exit ;; 1367 exit ;;
1358 *:TOPS-10:*:*) 1368 *:TOPS-10:*:*)
1359 echo pdp10-unknown-tops10 1369 echo pdp10-unknown-tops10
@@ -1374,14 +1384,14 @@ EOF
1374 echo pdp10-unknown-its 1384 echo pdp10-unknown-its
1375 exit ;; 1385 exit ;;
1376 SEI:*:*:SEIUX) 1386 SEI:*:*:SEIUX)
1377 echo mips-sei-seiux${UNAME_RELEASE} 1387 echo mips-sei-seiux"$UNAME_RELEASE"
1378 exit ;; 1388 exit ;;
1379 *:DragonFly:*:*) 1389 *:DragonFly:*:*)
1380 echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` 1390 echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
1381 exit ;; 1391 exit ;;
1382 *:*VMS:*:*) 1392 *:*VMS:*:*)
1383 UNAME_MACHINE=`(uname -p) 2>/dev/null` 1393 UNAME_MACHINE=`(uname -p) 2>/dev/null`
1384 case "${UNAME_MACHINE}" in 1394 case "$UNAME_MACHINE" in
1385 A*) echo alpha-dec-vms ; exit ;; 1395 A*) echo alpha-dec-vms ; exit ;;
1386 I*) echo ia64-dec-vms ; exit ;; 1396 I*) echo ia64-dec-vms ; exit ;;
1387 V*) echo vax-dec-vms ; exit ;; 1397 V*) echo vax-dec-vms ; exit ;;
@@ -1390,16 +1400,16 @@ EOF
1390 echo i386-pc-xenix 1400 echo i386-pc-xenix
1391 exit ;; 1401 exit ;;
1392 i*86:skyos:*:*) 1402 i*86:skyos:*:*)
1393 echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` 1403 echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
1394 exit ;; 1404 exit ;;
1395 i*86:rdos:*:*) 1405 i*86:rdos:*:*)
1396 echo ${UNAME_MACHINE}-pc-rdos 1406 echo "$UNAME_MACHINE"-pc-rdos
1397 exit ;; 1407 exit ;;
1398 i*86:AROS:*:*) 1408 i*86:AROS:*:*)
1399 echo ${UNAME_MACHINE}-pc-aros 1409 echo "$UNAME_MACHINE"-pc-aros
1400 exit ;; 1410 exit ;;
1401 x86_64:VMkernel:*:*) 1411 x86_64:VMkernel:*:*)
1402 echo ${UNAME_MACHINE}-unknown-esx 1412 echo "$UNAME_MACHINE"-unknown-esx
1403 exit ;; 1413 exit ;;
1404 amd64:Isilon\ OneFS:*:*) 1414 amd64:Isilon\ OneFS:*:*)
1405 echo x86_64-unknown-onefs 1415 echo x86_64-unknown-onefs
@@ -1408,7 +1418,7 @@ esac
1408 1418
1409echo "$0: unable to guess system type" >&2 1419echo "$0: unable to guess system type" >&2
1410 1420
1411case "${UNAME_MACHINE}:${UNAME_SYSTEM}" in 1421case "$UNAME_MACHINE:$UNAME_SYSTEM" in
1412 mips:Linux | mips64:Linux) 1422 mips:Linux | mips64:Linux)
1413 # If we got here on MIPS GNU/Linux, output extra information. 1423 # If we got here on MIPS GNU/Linux, output extra information.
1414 cat >&2 <<EOF 1424 cat >&2 <<EOF
@@ -1450,10 +1460,10 @@ hostinfo = `(hostinfo) 2>/dev/null`
1450/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` 1460/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
1451/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` 1461/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
1452 1462
1453UNAME_MACHINE = ${UNAME_MACHINE} 1463UNAME_MACHINE = "$UNAME_MACHINE"
1454UNAME_RELEASE = ${UNAME_RELEASE} 1464UNAME_RELEASE = "$UNAME_RELEASE"
1455UNAME_SYSTEM = ${UNAME_SYSTEM} 1465UNAME_SYSTEM = "$UNAME_SYSTEM"
1456UNAME_VERSION = ${UNAME_VERSION} 1466UNAME_VERSION = "$UNAME_VERSION"
1457EOF 1467EOF
1458 1468
1459exit 1 1469exit 1
diff --git a/build-aux/config.sub b/build-aux/config.sub
index a2ff1fb0565..818892c1c31 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -1,8 +1,8 @@
1#! /bin/sh 1#! /bin/sh
2# Configuration validation subroutine script. 2# Configuration validation subroutine script.
3# Copyright 1992-2017 Free Software Foundation, Inc. 3# Copyright 1992-2018 Free Software Foundation, Inc.
4 4
5timestamp='2018-01-01' 5timestamp='2018-01-15'
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
@@ -94,7 +94,7 @@ while test $# -gt 0 ; do
94 94
95 *local*) 95 *local*)
96 # First pass through any local machine types. 96 # First pass through any local machine types.
97 echo $1 97 echo "$1"
98 exit ;; 98 exit ;;
99 99
100 * ) 100 * )
@@ -112,7 +112,7 @@ esac
112 112
113# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). 113# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
114# Here we must recognize all the valid KERNEL-OS combinations. 114# Here we must recognize all the valid KERNEL-OS combinations.
115maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` 115maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
116case $maybe_os in 116case $maybe_os in
117 nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ 117 nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
118 linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ 118 linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
@@ -120,16 +120,16 @@ case $maybe_os in
120 kopensolaris*-gnu* | cloudabi*-eabi* | \ 120 kopensolaris*-gnu* | cloudabi*-eabi* | \
121 storm-chaos* | os2-emx* | rtmk-nova*) 121 storm-chaos* | os2-emx* | rtmk-nova*)
122 os=-$maybe_os 122 os=-$maybe_os
123 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` 123 basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
124 ;; 124 ;;
125 android-linux) 125 android-linux)
126 os=-linux-android 126 os=-linux-android
127 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown 127 basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
128 ;; 128 ;;
129 *) 129 *)
130 basic_machine=`echo $1 | sed 's/-[^-]*$//'` 130 basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
131 if [ $basic_machine != $1 ] 131 if [ "$basic_machine" != "$1" ]
132 then os=`echo $1 | sed 's/.*-/-/'` 132 then os=`echo "$1" | sed 's/.*-/-/'`
133 else os=; fi 133 else os=; fi
134 ;; 134 ;;
135esac 135esac
@@ -178,44 +178,44 @@ case $os in
178 ;; 178 ;;
179 -sco6) 179 -sco6)
180 os=-sco5v6 180 os=-sco5v6
181 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 181 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
182 ;; 182 ;;
183 -sco5) 183 -sco5)
184 os=-sco3.2v5 184 os=-sco3.2v5
185 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 185 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
186 ;; 186 ;;
187 -sco4) 187 -sco4)
188 os=-sco3.2v4 188 os=-sco3.2v4
189 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 189 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
190 ;; 190 ;;
191 -sco3.2.[4-9]*) 191 -sco3.2.[4-9]*)
192 os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` 192 os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
193 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 193 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
194 ;; 194 ;;
195 -sco3.2v[4-9]*) 195 -sco3.2v[4-9]*)
196 # Don't forget version if it is 3.2v4 or newer. 196 # Don't forget version if it is 3.2v4 or newer.
197 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 197 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
198 ;; 198 ;;
199 -sco5v6*) 199 -sco5v6*)
200 # Don't forget version if it is 3.2v4 or newer. 200 # Don't forget version if it is 3.2v4 or newer.
201 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 201 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
202 ;; 202 ;;
203 -sco*) 203 -sco*)
204 os=-sco3.2v2 204 os=-sco3.2v2
205 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 205 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
206 ;; 206 ;;
207 -udk*) 207 -udk*)
208 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 208 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
209 ;; 209 ;;
210 -isc) 210 -isc)
211 os=-isc2.2 211 os=-isc2.2
212 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 212 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
213 ;; 213 ;;
214 -clix*) 214 -clix*)
215 basic_machine=clipper-intergraph 215 basic_machine=clipper-intergraph
216 ;; 216 ;;
217 -isc*) 217 -isc*)
218 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 218 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
219 ;; 219 ;;
220 -lynx*178) 220 -lynx*178)
221 os=-lynxos178 221 os=-lynxos178
@@ -227,7 +227,7 @@ case $os in
227 os=-lynxos 227 os=-lynxos
228 ;; 228 ;;
229 -ptx*) 229 -ptx*)
230 basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` 230 basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
231 ;; 231 ;;
232 -psos*) 232 -psos*)
233 os=-psos 233 os=-psos
@@ -296,7 +296,7 @@ case $basic_machine in
296 | nios | nios2 | nios2eb | nios2el \ 296 | nios | nios2 | nios2eb | nios2el \
297 | ns16k | ns32k \ 297 | ns16k | ns32k \
298 | open8 | or1k | or1knd | or32 \ 298 | open8 | or1k | or1knd | or32 \
299 | pdp10 | pdp11 | pj | pjl \ 299 | pdp10 | pj | pjl \
300 | powerpc | powerpc64 | powerpc64le | powerpcle \ 300 | powerpc | powerpc64 | powerpc64le | powerpcle \
301 | pru \ 301 | pru \
302 | pyramid \ 302 | pyramid \
@@ -333,7 +333,7 @@ case $basic_machine in
333 basic_machine=$basic_machine-unknown 333 basic_machine=$basic_machine-unknown
334 os=-none 334 os=-none
335 ;; 335 ;;
336 m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) 336 m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
337 ;; 337 ;;
338 ms1) 338 ms1)
339 basic_machine=mt-unknown 339 basic_machine=mt-unknown
@@ -362,7 +362,7 @@ case $basic_machine in
362 ;; 362 ;;
363 # Object if more than one company name word. 363 # Object if more than one company name word.
364 *-*-*) 364 *-*-*)
365 echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 365 echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
366 exit 1 366 exit 1
367 ;; 367 ;;
368 # Recognize the basic CPU types with company name. 368 # Recognize the basic CPU types with company name.
@@ -457,7 +457,7 @@ case $basic_machine in
457 # Recognize the various machine names and aliases which stand 457 # Recognize the various machine names and aliases which stand
458 # for a CPU type and a company and sometimes even an OS. 458 # for a CPU type and a company and sometimes even an OS.
459 386bsd) 459 386bsd)
460 basic_machine=i386-unknown 460 basic_machine=i386-pc
461 os=-bsd 461 os=-bsd
462 ;; 462 ;;
463 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) 463 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
@@ -491,7 +491,7 @@ case $basic_machine in
491 basic_machine=x86_64-pc 491 basic_machine=x86_64-pc
492 ;; 492 ;;
493 amd64-*) 493 amd64-*)
494 basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` 494 basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
495 ;; 495 ;;
496 amdahl) 496 amdahl)
497 basic_machine=580-amdahl 497 basic_machine=580-amdahl
@@ -536,7 +536,7 @@ case $basic_machine in
536 os=-linux 536 os=-linux
537 ;; 537 ;;
538 blackfin-*) 538 blackfin-*)
539 basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` 539 basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
540 os=-linux 540 os=-linux
541 ;; 541 ;;
542 bluegene*) 542 bluegene*)
@@ -544,13 +544,13 @@ case $basic_machine in
544 os=-cnk 544 os=-cnk
545 ;; 545 ;;
546 c54x-*) 546 c54x-*)
547 basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` 547 basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
548 ;; 548 ;;
549 c55x-*) 549 c55x-*)
550 basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` 550 basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
551 ;; 551 ;;
552 c6x-*) 552 c6x-*)
553 basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` 553 basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
554 ;; 554 ;;
555 c90) 555 c90)
556 basic_machine=c90-cray 556 basic_machine=c90-cray
@@ -648,7 +648,7 @@ case $basic_machine in
648 os=$os"spe" 648 os=$os"spe"
649 ;; 649 ;;
650 e500v[12]-*) 650 e500v[12]-*)
651 basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` 651 basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
652 os=$os"spe" 652 os=$os"spe"
653 ;; 653 ;;
654 ebmon29k) 654 ebmon29k)
@@ -740,9 +740,6 @@ case $basic_machine in
740 hp9k8[0-9][0-9] | hp8[0-9][0-9]) 740 hp9k8[0-9][0-9] | hp8[0-9][0-9])
741 basic_machine=hppa1.0-hp 741 basic_machine=hppa1.0-hp
742 ;; 742 ;;
743 hppa-next)
744 os=-nextstep3
745 ;;
746 hppaosf) 743 hppaosf)
747 basic_machine=hppa1.1-hp 744 basic_machine=hppa1.1-hp
748 os=-osf 745 os=-osf
@@ -755,26 +752,26 @@ case $basic_machine in
755 basic_machine=i370-ibm 752 basic_machine=i370-ibm
756 ;; 753 ;;
757 i*86v32) 754 i*86v32)
758 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` 755 basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
759 os=-sysv32 756 os=-sysv32
760 ;; 757 ;;
761 i*86v4*) 758 i*86v4*)
762 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` 759 basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
763 os=-sysv4 760 os=-sysv4
764 ;; 761 ;;
765 i*86v) 762 i*86v)
766 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` 763 basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
767 os=-sysv 764 os=-sysv
768 ;; 765 ;;
769 i*86sol2) 766 i*86sol2)
770 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` 767 basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
771 os=-solaris2 768 os=-solaris2
772 ;; 769 ;;
773 i386mach) 770 i386mach)
774 basic_machine=i386-mach 771 basic_machine=i386-mach
775 os=-mach 772 os=-mach
776 ;; 773 ;;
777 i386-vsta | vsta) 774 vsta)
778 basic_machine=i386-unknown 775 basic_machine=i386-unknown
779 os=-vsta 776 os=-vsta
780 ;; 777 ;;
@@ -793,19 +790,16 @@ case $basic_machine in
793 os=-sysv 790 os=-sysv
794 ;; 791 ;;
795 leon-*|leon[3-9]-*) 792 leon-*|leon[3-9]-*)
796 basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` 793 basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
797 ;; 794 ;;
798 m68knommu) 795 m68knommu)
799 basic_machine=m68k-unknown 796 basic_machine=m68k-unknown
800 os=-linux 797 os=-linux
801 ;; 798 ;;
802 m68knommu-*) 799 m68knommu-*)
803 basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` 800 basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
804 os=-linux 801 os=-linux
805 ;; 802 ;;
806 m88k-omron*)
807 basic_machine=m88k-omron
808 ;;
809 magnum | m3230) 803 magnum | m3230)
810 basic_machine=mips-mips 804 basic_machine=mips-mips
811 os=-sysv 805 os=-sysv
@@ -837,10 +831,10 @@ case $basic_machine in
837 os=-mint 831 os=-mint
838 ;; 832 ;;
839 mips3*-*) 833 mips3*-*)
840 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` 834 basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
841 ;; 835 ;;
842 mips3*) 836 mips3*)
843 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown 837 basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
844 ;; 838 ;;
845 monitor) 839 monitor)
846 basic_machine=m68k-rom68k 840 basic_machine=m68k-rom68k
@@ -859,7 +853,7 @@ case $basic_machine in
859 os=-msdos 853 os=-msdos
860 ;; 854 ;;
861 ms1-*) 855 ms1-*)
862 basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` 856 basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
863 ;; 857 ;;
864 msys) 858 msys)
865 basic_machine=i686-pc 859 basic_machine=i686-pc
@@ -946,6 +940,9 @@ case $basic_machine in
946 nsr-tandem) 940 nsr-tandem)
947 basic_machine=nsr-tandem 941 basic_machine=nsr-tandem
948 ;; 942 ;;
943 nsv-tandem)
944 basic_machine=nsv-tandem
945 ;;
949 nsx-tandem) 946 nsx-tandem)
950 basic_machine=nsx-tandem 947 basic_machine=nsx-tandem
951 ;; 948 ;;
@@ -981,7 +978,7 @@ case $basic_machine in
981 os=-linux 978 os=-linux
982 ;; 979 ;;
983 parisc-*) 980 parisc-*)
984 basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` 981 basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
985 os=-linux 982 os=-linux
986 ;; 983 ;;
987 pbd) 984 pbd)
@@ -997,7 +994,7 @@ case $basic_machine in
997 basic_machine=i386-pc 994 basic_machine=i386-pc
998 ;; 995 ;;
999 pc98-*) 996 pc98-*)
1000 basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` 997 basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1001 ;; 998 ;;
1002 pentium | p5 | k5 | k6 | nexgen | viac3) 999 pentium | p5 | k5 | k6 | nexgen | viac3)
1003 basic_machine=i586-pc 1000 basic_machine=i586-pc
@@ -1012,16 +1009,16 @@ case $basic_machine in
1012 basic_machine=i786-pc 1009 basic_machine=i786-pc
1013 ;; 1010 ;;
1014 pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) 1011 pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
1015 basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` 1012 basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1016 ;; 1013 ;;
1017 pentiumpro-* | p6-* | 6x86-* | athlon-*) 1014 pentiumpro-* | p6-* | 6x86-* | athlon-*)
1018 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` 1015 basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1019 ;; 1016 ;;
1020 pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) 1017 pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
1021 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` 1018 basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1022 ;; 1019 ;;
1023 pentium4-*) 1020 pentium4-*)
1024 basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` 1021 basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1025 ;; 1022 ;;
1026 pn) 1023 pn)
1027 basic_machine=pn-gould 1024 basic_machine=pn-gould
@@ -1031,23 +1028,23 @@ case $basic_machine in
1031 ppc | ppcbe) basic_machine=powerpc-unknown 1028 ppc | ppcbe) basic_machine=powerpc-unknown
1032 ;; 1029 ;;
1033 ppc-* | ppcbe-*) 1030 ppc-* | ppcbe-*)
1034 basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` 1031 basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1035 ;; 1032 ;;
1036 ppcle | powerpclittle) 1033 ppcle | powerpclittle)
1037 basic_machine=powerpcle-unknown 1034 basic_machine=powerpcle-unknown
1038 ;; 1035 ;;
1039 ppcle-* | powerpclittle-*) 1036 ppcle-* | powerpclittle-*)
1040 basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` 1037 basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1041 ;; 1038 ;;
1042 ppc64) basic_machine=powerpc64-unknown 1039 ppc64) basic_machine=powerpc64-unknown
1043 ;; 1040 ;;
1044 ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` 1041 ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1045 ;; 1042 ;;
1046 ppc64le | powerpc64little) 1043 ppc64le | powerpc64little)
1047 basic_machine=powerpc64le-unknown 1044 basic_machine=powerpc64le-unknown
1048 ;; 1045 ;;
1049 ppc64le-* | powerpc64little-*) 1046 ppc64le-* | powerpc64little-*)
1050 basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` 1047 basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1051 ;; 1048 ;;
1052 ps2) 1049 ps2)
1053 basic_machine=i386-ibm 1050 basic_machine=i386-ibm
@@ -1101,17 +1098,10 @@ case $basic_machine in
1101 sequent) 1098 sequent)
1102 basic_machine=i386-sequent 1099 basic_machine=i386-sequent
1103 ;; 1100 ;;
1104 sh)
1105 basic_machine=sh-hitachi
1106 os=-hms
1107 ;;
1108 sh5el) 1101 sh5el)
1109 basic_machine=sh5le-unknown 1102 basic_machine=sh5le-unknown
1110 ;; 1103 ;;
1111 sh64) 1104 simso-wrs)
1112 basic_machine=sh64-unknown
1113 ;;
1114 sparclite-wrs | simso-wrs)
1115 basic_machine=sparclite-wrs 1105 basic_machine=sparclite-wrs
1116 os=-vxworks 1106 os=-vxworks
1117 ;; 1107 ;;
@@ -1130,7 +1120,7 @@ case $basic_machine in
1130 os=-sysv4 1120 os=-sysv4
1131 ;; 1121 ;;
1132 strongarm-* | thumb-*) 1122 strongarm-* | thumb-*)
1133 basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` 1123 basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1134 ;; 1124 ;;
1135 sun2) 1125 sun2)
1136 basic_machine=m68000-sun 1126 basic_machine=m68000-sun
@@ -1244,9 +1234,6 @@ case $basic_machine in
1244 basic_machine=a29k-wrs 1234 basic_machine=a29k-wrs
1245 os=-vxworks 1235 os=-vxworks
1246 ;; 1236 ;;
1247 wasm32)
1248 basic_machine=wasm32-unknown
1249 ;;
1250 w65*) 1237 w65*)
1251 basic_machine=w65-wdc 1238 basic_machine=w65-wdc
1252 os=-none 1239 os=-none
@@ -1266,20 +1253,12 @@ case $basic_machine in
1266 basic_machine=xps100-honeywell 1253 basic_machine=xps100-honeywell
1267 ;; 1254 ;;
1268 xscale-* | xscalee[bl]-*) 1255 xscale-* | xscalee[bl]-*)
1269 basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` 1256 basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
1270 ;; 1257 ;;
1271 ymp) 1258 ymp)
1272 basic_machine=ymp-cray 1259 basic_machine=ymp-cray
1273 os=-unicos 1260 os=-unicos
1274 ;; 1261 ;;
1275 z8k-*-coff)
1276 basic_machine=z8k-unknown
1277 os=-sim
1278 ;;
1279 z80-*-coff)
1280 basic_machine=z80-unknown
1281 os=-sim
1282 ;;
1283 none) 1262 none)
1284 basic_machine=none-none 1263 basic_machine=none-none
1285 os=-none 1264 os=-none
@@ -1308,10 +1287,6 @@ case $basic_machine in
1308 vax) 1287 vax)
1309 basic_machine=vax-dec 1288 basic_machine=vax-dec
1310 ;; 1289 ;;
1311 pdp10)
1312 # there are many clones, so DEC is not a safe bet
1313 basic_machine=pdp10-unknown
1314 ;;
1315 pdp11) 1290 pdp11)
1316 basic_machine=pdp11-dec 1291 basic_machine=pdp11-dec
1317 ;; 1292 ;;
@@ -1321,9 +1296,6 @@ case $basic_machine in
1321 sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) 1296 sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
1322 basic_machine=sh-unknown 1297 basic_machine=sh-unknown
1323 ;; 1298 ;;
1324 sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
1325 basic_machine=sparc-sun
1326 ;;
1327 cydra) 1299 cydra)
1328 basic_machine=cydra-cydrome 1300 basic_machine=cydra-cydrome
1329 ;; 1301 ;;
@@ -1343,7 +1315,7 @@ case $basic_machine in
1343 # Make sure to match an already-canonicalized machine name. 1315 # Make sure to match an already-canonicalized machine name.
1344 ;; 1316 ;;
1345 *) 1317 *)
1346 echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 1318 echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
1347 exit 1 1319 exit 1
1348 ;; 1320 ;;
1349esac 1321esac
@@ -1351,10 +1323,10 @@ esac
1351# Here we canonicalize certain aliases for manufacturers. 1323# Here we canonicalize certain aliases for manufacturers.
1352case $basic_machine in 1324case $basic_machine in
1353 *-digital*) 1325 *-digital*)
1354 basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` 1326 basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
1355 ;; 1327 ;;
1356 *-commodore*) 1328 *-commodore*)
1357 basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` 1329 basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
1358 ;; 1330 ;;
1359 *) 1331 *)
1360 ;; 1332 ;;
@@ -1377,15 +1349,16 @@ case $os in
1377 -solaris) 1349 -solaris)
1378 os=-solaris2 1350 os=-solaris2
1379 ;; 1351 ;;
1380 -svr4*)
1381 os=-sysv4
1382 ;;
1383 -unixware*) 1352 -unixware*)
1384 os=-sysv4.2uw 1353 os=-sysv4.2uw
1385 ;; 1354 ;;
1386 -gnu/linux*) 1355 -gnu/linux*)
1387 os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` 1356 os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
1388 ;; 1357 ;;
1358 # es1800 is here to avoid being matched by es* (a different OS)
1359 -es1800*)
1360 os=-ose
1361 ;;
1389 # Now accept the basic system types. 1362 # Now accept the basic system types.
1390 # The portable systems comes first. 1363 # The portable systems comes first.
1391 # Each alternative MUST end in a * to match a version number. 1364 # Each alternative MUST end in a * to match a version number.
@@ -1398,7 +1371,7 @@ case $os in
1398 | -aos* | -aros* | -cloudabi* | -sortix* \ 1371 | -aos* | -aros* | -cloudabi* | -sortix* \
1399 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ 1372 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1400 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ 1373 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1401 | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ 1374 | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
1402 | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ 1375 | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
1403 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ 1376 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
1404 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ 1377 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
@@ -1409,11 +1382,11 @@ case $os in
1409 | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ 1382 | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
1410 | -linux-newlib* | -linux-musl* | -linux-uclibc* \ 1383 | -linux-newlib* | -linux-musl* | -linux-uclibc* \
1411 | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ 1384 | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
1412 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ 1385 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
1413 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ 1386 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1414 | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ 1387 | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1415 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ 1388 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1416 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ 1389 | -morphos* | -superux* | -rtmk* | -windiss* \
1417 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ 1390 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1418 | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ 1391 | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
1419 | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme*) 1392 | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme*)
@@ -1433,12 +1406,12 @@ case $os in
1433 -nto*) 1406 -nto*)
1434 os=`echo $os | sed -e 's|nto|nto-qnx|'` 1407 os=`echo $os | sed -e 's|nto|nto-qnx|'`
1435 ;; 1408 ;;
1436 -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ 1409 -sim | -xray | -os68k* | -v88r* \
1437 | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ 1410 | -windows* | -osx | -abug | -netware* | -os9* \
1438 | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) 1411 | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
1439 ;; 1412 ;;
1440 -mac*) 1413 -mac*)
1441 os=`echo $os | sed -e 's|mac|macos|'` 1414 os=`echo "$os" | sed -e 's|mac|macos|'`
1442 ;; 1415 ;;
1443 -linux-dietlibc) 1416 -linux-dietlibc)
1444 os=-linux-dietlibc 1417 os=-linux-dietlibc
@@ -1447,10 +1420,10 @@ case $os in
1447 os=`echo $os | sed -e 's|linux|linux-gnu|'` 1420 os=`echo $os | sed -e 's|linux|linux-gnu|'`
1448 ;; 1421 ;;
1449 -sunos5*) 1422 -sunos5*)
1450 os=`echo $os | sed -e 's|sunos5|solaris2|'` 1423 os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
1451 ;; 1424 ;;
1452 -sunos6*) 1425 -sunos6*)
1453 os=`echo $os | sed -e 's|sunos6|solaris3|'` 1426 os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
1454 ;; 1427 ;;
1455 -opened*) 1428 -opened*)
1456 os=-openedition 1429 os=-openedition
@@ -1461,12 +1434,6 @@ case $os in
1461 -wince*) 1434 -wince*)
1462 os=-wince 1435 os=-wince
1463 ;; 1436 ;;
1464 -osfrose*)
1465 os=-osfrose
1466 ;;
1467 -osf*)
1468 os=-osf
1469 ;;
1470 -utek*) 1437 -utek*)
1471 os=-bsd 1438 os=-bsd
1472 ;; 1439 ;;
@@ -1513,7 +1480,7 @@ case $os in
1513 -oss*) 1480 -oss*)
1514 os=-sysv3 1481 os=-sysv3
1515 ;; 1482 ;;
1516 -svr4) 1483 -svr4*)
1517 os=-sysv4 1484 os=-sysv4
1518 ;; 1485 ;;
1519 -svr3) 1486 -svr3)
@@ -1528,18 +1495,9 @@ case $os in
1528 -ose*) 1495 -ose*)
1529 os=-ose 1496 os=-ose
1530 ;; 1497 ;;
1531 -es1800*)
1532 os=-ose
1533 ;;
1534 -xenix)
1535 os=-xenix
1536 ;;
1537 -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) 1498 -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
1538 os=-mint 1499 os=-mint
1539 ;; 1500 ;;
1540 -aros*)
1541 os=-aros
1542 ;;
1543 -zvmoe) 1501 -zvmoe)
1544 os=-zvmoe 1502 os=-zvmoe
1545 ;; 1503 ;;
@@ -1568,7 +1526,7 @@ case $os in
1568 *) 1526 *)
1569 # Get rid of the `-' at the beginning of $os. 1527 # Get rid of the `-' at the beginning of $os.
1570 os=`echo $os | sed 's/[^-]*-//'` 1528 os=`echo $os | sed 's/[^-]*-//'`
1571 echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 1529 echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
1572 exit 1 1530 exit 1
1573 ;; 1531 ;;
1574esac 1532esac
@@ -1664,9 +1622,6 @@ case $basic_machine in
1664 *-be) 1622 *-be)
1665 os=-beos 1623 os=-beos
1666 ;; 1624 ;;
1667 *-haiku)
1668 os=-haiku
1669 ;;
1670 *-ibm) 1625 *-ibm)
1671 os=-aix 1626 os=-aix
1672 ;; 1627 ;;
@@ -1721,9 +1676,6 @@ case $basic_machine in
1721 i370-*) 1676 i370-*)
1722 os=-mvs 1677 os=-mvs
1723 ;; 1678 ;;
1724 *-next)
1725 os=-nextstep3
1726 ;;
1727 *-gould) 1679 *-gould)
1728 os=-sysv 1680 os=-sysv
1729 ;; 1681 ;;
@@ -1833,11 +1785,11 @@ case $basic_machine in
1833 vendor=stratus 1785 vendor=stratus
1834 ;; 1786 ;;
1835 esac 1787 esac
1836 basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` 1788 basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
1837 ;; 1789 ;;
1838esac 1790esac
1839 1791
1840echo $basic_machine$os 1792echo "$basic_machine$os"
1841exit 1793exit
1842 1794
1843# Local variables: 1795# Local variables:
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex
index 1987c50ba26..c614e024058 100644
--- a/doc/misc/texinfo.tex
+++ b/doc/misc/texinfo.tex
@@ -3,11 +3,11 @@
3% Load plain if necessary, i.e., if running under initex. 3% Load plain if necessary, i.e., if running under initex.
4\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi 4\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
5% 5%
6\def\texinfoversion{2017-12-26.21} 6\def\texinfoversion{2018-01-09.11}
7% 7%
8% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, 8% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
9% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 9% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
10% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 10% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
11% Free Software Foundation, Inc. 11% Free Software Foundation, Inc.
12% 12%
13% This texinfo.tex file is free software: you can redistribute it and/or 13% This texinfo.tex file is free software: you can redistribute it and/or
@@ -2235,6 +2235,20 @@ end
2235\font\smallersy=cmsy8 2235\font\smallersy=cmsy8
2236\def\smallerecsize{0800} 2236\def\smallerecsize{0800}
2237 2237
2238% Fonts for math mode superscripts (7pt).
2239\def\sevennominalsize{7pt}
2240\setfont\sevenrm\rmshape{7}{1000}{OT1}
2241\setfont\seventt\ttshape{10}{700}{OT1TT}
2242\setfont\sevenbf\bfshape{10}{700}{OT1}
2243\setfont\sevenit\itshape{7}{1000}{OT1IT}
2244\setfont\sevensl\slshape{10}{700}{OT1}
2245\setfont\sevensf\sfshape{10}{700}{OT1}
2246\setfont\sevensc\scshape{10}{700}{OT1}
2247\setfont\seventtsl\ttslshape{10}{700}{OT1TT}
2248\font\seveni=cmmi7
2249\font\sevensy=cmsy7
2250\def\sevenecsize{0700}
2251
2238% Fonts for title page (20.4pt): 2252% Fonts for title page (20.4pt):
2239\def\titlenominalsize{20pt} 2253\def\titlenominalsize{20pt}
2240\setfont\titlerm\rmbshape{12}{\magstep3}{OT1} 2254\setfont\titlerm\rmbshape{12}{\magstep3}{OT1}
@@ -2369,6 +2383,20 @@ end
2369\font\smallersy=cmsy8 2383\font\smallersy=cmsy8
2370\def\smallerecsize{0800} 2384\def\smallerecsize{0800}
2371 2385
2386% Fonts for math mode superscripts (7pt).
2387\def\sevennominalsize{7pt}
2388\setfont\sevenrm\rmshape{7}{1000}{OT1}
2389\setfont\seventt\ttshape{10}{700}{OT1TT}
2390\setfont\sevenbf\bfshape{10}{700}{OT1}
2391\setfont\sevenit\itshape{7}{1000}{OT1IT}
2392\setfont\sevensl\slshape{10}{700}{OT1}
2393\setfont\sevensf\sfshape{10}{700}{OT1}
2394\setfont\sevensc\scshape{10}{700}{OT1}
2395\setfont\seventtsl\ttslshape{10}{700}{OT1TT}
2396\font\seveni=cmmi7
2397\font\sevensy=cmsy7
2398\def\sevenecsize{0700}
2399
2372% Fonts for title page (20.4pt): 2400% Fonts for title page (20.4pt):
2373\def\titlenominalsize{20pt} 2401\def\titlenominalsize{20pt}
2374\setfont\titlerm\rmbshape{12}{\magstep3}{OT1} 2402\setfont\titlerm\rmbshape{12}{\magstep3}{OT1}
@@ -2503,13 +2531,20 @@ end
2503 2531
2504 2532
2505% In order for the font changes to affect most math symbols and letters, 2533% In order for the font changes to affect most math symbols and letters,
2506% we have to define the \textfont of the standard families. We don't 2534% we have to define the \textfont of the standard families.
2507% bother to reset \scriptfont and \scriptscriptfont; awaiting user need. 2535% We don't bother to reset \scriptscriptfont; awaiting user need.
2508% 2536%
2509\def\resetmathfonts{% 2537\def\resetmathfonts{%
2510 \textfont0=\rmfont \textfont1=\ifont \textfont2=\syfont 2538 \textfont0=\rmfont \textfont1=\ifont \textfont2=\syfont
2511 \textfont\itfam=\itfont \textfont\slfam=\slfont \textfont\bffam=\bffont 2539 \textfont\itfam=\itfont \textfont\slfam=\slfont \textfont\bffam=\bffont
2512 \textfont\ttfam=\ttfont \textfont\sffam=\sffont 2540 \textfont\ttfam=\ttfont \textfont\sffam=\sffont
2541 %
2542 % Fonts for superscript. Note that the 7pt fonts are used regardless
2543 % of the current font size.
2544 \scriptfont0=\sevenrm \scriptfont1=\seveni \scriptfont2=\sevensy
2545 \scriptfont\itfam=\sevenit \scriptfont\slfam=\sevensl
2546 \scriptfont\bffam=\sevenbf \scriptfont\ttfam=\seventt
2547 \scriptfont\sffam=\sevensf
2513} 2548}
2514 2549
2515% 2550%
@@ -2519,6 +2554,9 @@ end
2519% to also set the current \fam for math mode. Our \STYLE (e.g., \rm) 2554% to also set the current \fam for math mode. Our \STYLE (e.g., \rm)
2520% commands hardwire \STYLEfont to set the current font. 2555% commands hardwire \STYLEfont to set the current font.
2521% 2556%
2557% The fonts used for \ifont are for "math italics" (\itfont is for italics
2558% in regular text). \syfont is also used in math mode only.
2559%
2522% Each font-changing command also sets the names \lsize (one size lower) 2560% Each font-changing command also sets the names \lsize (one size lower)
2523% and \lllsize (three sizes lower). These relative commands are used 2561% and \lllsize (three sizes lower). These relative commands are used
2524% in, e.g., the LaTeX logo and acronyms. 2562% in, e.g., the LaTeX logo and acronyms.
diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in
index 49f4d236e44..451c1572fdc 100644
--- a/lib/gnulib.mk.in
+++ b/lib/gnulib.mk.in
@@ -44,6 +44,7 @@ BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
44BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@ 44BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
45BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@ 45BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
46BLESSMAIL_TARGET = @BLESSMAIL_TARGET@ 46BLESSMAIL_TARGET = @BLESSMAIL_TARGET@
47BREW = @BREW@
47BUILD_DETAILS = @BUILD_DETAILS@ 48BUILD_DETAILS = @BUILD_DETAILS@
48BYTESWAP_H = @BYTESWAP_H@ 49BYTESWAP_H = @BYTESWAP_H@
49CAIRO_CFLAGS = @CAIRO_CFLAGS@ 50CAIRO_CFLAGS = @CAIRO_CFLAGS@
diff --git a/lib/nstrftime.c b/lib/nstrftime.c
index 9e7abddc8a3..46e806e6049 100644
--- a/lib/nstrftime.c
+++ b/lib/nstrftime.c
@@ -91,6 +91,7 @@ extern char *tzname[];
91# define UCHAR_T unsigned char 91# define UCHAR_T unsigned char
92# define L_(Str) Str 92# define L_(Str) Str
93# define NLW(Sym) Sym 93# define NLW(Sym) Sym
94# define ABALTMON_1 _NL_ABALTMON_1
94 95
95# define MEMCPY(d, s, n) memcpy (d, s, n) 96# define MEMCPY(d, s, n) memcpy (d, s, n)
96# define STRLEN(s) strlen (s) 97# define STRLEN(s) strlen (s)
@@ -255,7 +256,7 @@ extern char *tzname[];
255# undef _NL_CURRENT 256# undef _NL_CURRENT
256# define _NL_CURRENT(category, item) \ 257# define _NL_CURRENT(category, item) \
257 (current->values[_NL_ITEM_INDEX (item)].string) 258 (current->values[_NL_ITEM_INDEX (item)].string)
258# define LOCALE_PARAM , __locale_t loc 259# define LOCALE_PARAM , locale_t loc
259# define LOCALE_ARG , loc 260# define LOCALE_ARG , loc
260# define HELPER_LOCALE_ARG , current 261# define HELPER_LOCALE_ARG , current
261#else 262#else
@@ -475,12 +476,19 @@ __strftime_internal (STREAM_OR_CHAR_T *s, STRFTIME_ARG (size_t maxsize)
475# define f_month \ 476# define f_month \
476 ((const CHAR_T *) (tp->tm_mon < 0 || tp->tm_mon > 11 \ 477 ((const CHAR_T *) (tp->tm_mon < 0 || tp->tm_mon > 11 \
477 ? "?" : _NL_CURRENT (LC_TIME, NLW(MON_1) + tp->tm_mon))) 478 ? "?" : _NL_CURRENT (LC_TIME, NLW(MON_1) + tp->tm_mon)))
479# define a_altmonth \
480 ((const CHAR_T *) (tp->tm_mon < 0 || tp->tm_mon > 11 \
481 ? "?" : _NL_CURRENT (LC_TIME, NLW(ABALTMON_1) + tp->tm_mon)))
482# define f_altmonth \
483 ((const CHAR_T *) (tp->tm_mon < 0 || tp->tm_mon > 11 \
484 ? "?" : _NL_CURRENT (LC_TIME, NLW(ALTMON_1) + tp->tm_mon)))
478# define ampm \ 485# define ampm \
479 ((const CHAR_T *) _NL_CURRENT (LC_TIME, tp->tm_hour > 11 \ 486 ((const CHAR_T *) _NL_CURRENT (LC_TIME, tp->tm_hour > 11 \
480 ? NLW(PM_STR) : NLW(AM_STR))) 487 ? NLW(PM_STR) : NLW(AM_STR)))
481 488
482# define aw_len STRLEN (a_wkday) 489# define aw_len STRLEN (a_wkday)
483# define am_len STRLEN (a_month) 490# define am_len STRLEN (a_month)
491# define aam_len STRLEN (a_altmonth)
484# define ap_len STRLEN (ampm) 492# define ap_len STRLEN (ampm)
485#endif 493#endif
486#if HAVE_TZNAME 494#if HAVE_TZNAME
@@ -808,17 +816,20 @@ __strftime_internal (STREAM_OR_CHAR_T *s, STRFTIME_ARG (size_t maxsize)
808 to_uppcase = true; 816 to_uppcase = true;
809 to_lowcase = false; 817 to_lowcase = false;
810 } 818 }
811 if (modifier != 0) 819 if (modifier == L_('E'))
812 goto bad_format; 820 goto bad_format;
813#ifdef _NL_CURRENT 821#ifdef _NL_CURRENT
814 cpy (am_len, a_month); 822 if (modifier == L_('O'))
823 cpy (aam_len, a_altmonth);
824 else
825 cpy (am_len, a_month);
815 break; 826 break;
816#else 827#else
817 goto underlying_strftime; 828 goto underlying_strftime;
818#endif 829#endif
819 830
820 case L_('B'): 831 case L_('B'):
821 if (modifier != 0) 832 if (modifier == L_('E'))
822 goto bad_format; 833 goto bad_format;
823 if (change_case) 834 if (change_case)
824 { 835 {
@@ -826,7 +837,10 @@ __strftime_internal (STREAM_OR_CHAR_T *s, STRFTIME_ARG (size_t maxsize)
826 to_lowcase = false; 837 to_lowcase = false;
827 } 838 }
828#ifdef _NL_CURRENT 839#ifdef _NL_CURRENT
829 cpy (STRLEN (f_month), f_month); 840 if (modifier == L_('O'))
841 cpy (STRLEN (f_altmonth), f_altmonth);
842 else
843 cpy (STRLEN (f_month), f_month);
830 break; 844 break;
831#else 845#else
832 goto underlying_strftime; 846 goto underlying_strftime;
diff --git a/lib/unistd.in.h b/lib/unistd.in.h
index ae59cb2e627..13f4bb6cd16 100644
--- a/lib/unistd.in.h
+++ b/lib/unistd.in.h
@@ -400,6 +400,13 @@ _GL_WARN_ON_USE (dup3, "dup3 is unportable - "
400 400
401 401
402#if @GNULIB_ENVIRON@ 402#if @GNULIB_ENVIRON@
403# if defined __CYGWIN__
404/* The 'environ' variable is defined in a DLL. Therefore its declaration needs
405 the '__declspec(dllimport)' attribute, but the system's <unistd.h> lacks it.
406 This leads to a link error on 64-bit Cygwin when the option
407 -Wl,--disable-auto-import is in use. */
408_GL_EXTERN_C __declspec(dllimport) char **environ;
409# endif
403# if !@HAVE_DECL_ENVIRON@ 410# if !@HAVE_DECL_ENVIRON@
404/* Set of environment variables and values. An array of strings of the form 411/* Set of environment variables and values. An array of strings of the form
405 "VARIABLE=VALUE", terminated with a NULL. */ 412 "VARIABLE=VALUE", terminated with a NULL. */
diff --git a/m4/extensions.m4 b/m4/extensions.m4
index d1b23215b05..71a854f8bfa 100644
--- a/m4/extensions.m4
+++ b/m4/extensions.m4
@@ -1,4 +1,4 @@
1# serial 17 -*- Autoconf -*- 1# serial 18 -*- Autoconf -*-
2# Enable extensions on systems that normally disable them. 2# Enable extensions on systems that normally disable them.
3 3
4# Copyright (C) 2003, 2006-2018 Free Software Foundation, Inc. 4# Copyright (C) 2003, 2006-2018 Free Software Foundation, Inc.
@@ -118,6 +118,11 @@ dnl configure.ac when using autoheader 2.62.
118#ifndef _XOPEN_SOURCE 118#ifndef _XOPEN_SOURCE
119# undef _XOPEN_SOURCE 119# undef _XOPEN_SOURCE
120#endif 120#endif
121/* Enable X/Open compliant socket functions that do not require linking
122 with -lxnet on HP-UX 11.11. */
123#ifndef _HPUX_ALT_XOPEN_SOCKET_API
124# undef _HPUX_ALT_XOPEN_SOCKET_API
125#endif
121/* Enable general extensions on Solaris. */ 126/* Enable general extensions on Solaris. */
122#ifndef __EXTENSIONS__ 127#ifndef __EXTENSIONS__
123# undef __EXTENSIONS__ 128# undef __EXTENSIONS__
@@ -163,6 +168,7 @@ dnl configure.ac when using autoheader 2.62.
163 [ac_cv_should_define__xopen_source=yes])])]) 168 [ac_cv_should_define__xopen_source=yes])])])
164 test $ac_cv_should_define__xopen_source = yes && 169 test $ac_cv_should_define__xopen_source = yes &&
165 AC_DEFINE([_XOPEN_SOURCE], [500]) 170 AC_DEFINE([_XOPEN_SOURCE], [500])
171 AC_DEFINE([_HPUX_ALT_XOPEN_SOCKET_API])
166])# AC_USE_SYSTEM_EXTENSIONS 172])# AC_USE_SYSTEM_EXTENSIONS
167 173
168# gl_USE_SYSTEM_EXTENSIONS 174# gl_USE_SYSTEM_EXTENSIONS
diff --git a/m4/manywarnings.m4 b/m4/manywarnings.m4
index dda3d468aef..18249b8f2ea 100644
--- a/m4/manywarnings.m4
+++ b/m4/manywarnings.m4
@@ -106,7 +106,7 @@ m4_defun([gl_MANYWARN_ALL_GCC(C)],
106 # To compare this list to your installed GCC's, run this Bash command: 106 # To compare this list to your installed GCC's, run this Bash command:
107 # 107 #
108 # comm -3 \ 108 # comm -3 \
109 # <(sed -n 's/^ *\(-[^ ]*\) .*/\1/p' manywarnings.m4 | sort) \ 109 # <(sed -n 's/^ *\(-[^ 0-9][^ ]*\) .*/\1/p' manywarnings.m4 | sort) \
110 # <(gcc --help=warnings | sed -n 's/^ \(-[^ ]*\) .*/\1/p' | sort | 110 # <(gcc --help=warnings | sed -n 's/^ \(-[^ ]*\) .*/\1/p' | sort |
111 # grep -v -x -F -f <( 111 # grep -v -x -F -f <(
112 # awk '/^[^#]/ {print $1}' ../build-aux/gcc-warning.spec)) 112 # awk '/^[^#]/ {print $1}' ../build-aux/gcc-warning.spec))
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-20 02:49:02 +0000