Skip to content

Commit 1225bb7

Browse files
bhaiblebhaible
committed
Upgrade config.* files.
1 parent 0dc9577 commit 1225bb7

File tree

3 files changed

+70
-34
lines changed

3 files changed

+70
-34
lines changed

‎ChangeLog‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
2006-07-19 Bruno Haible <bruno@clisp.org>
2+
3+
* Version 1.11 released.
4+
5+
2005-07-19 Bruno Haible <bruno@clisp.org>
6+
7+
* build-aux/config.guess: Update to GNU version 2006-07-02.
8+
* build-aux/config.sub: Likewise.
9+
110
2006-07-14 Bruno Haible <bruno@clisp.org>
211

312
* lib/Makefile.in (clean): Remove also *.stackdump.

‎build-aux/config.guess‎

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#! /bin/sh
22
# Attempt to guess a canonical system name.
33
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4-
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
4+
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
5+
# Inc.
56

6-
timestamp='2005-12-23'
7+
timestamp='2006-07-02'
78

89
# This file is free software; you can redistribute it and/or modify it
910
# under the terms of the GNU General Public License as published by
@@ -106,7 +107,7 @@ set_cc_for_build='
106107
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
107108
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
108109
: ${TMPDIR=/tmp} ;
109-
{ tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
110+
{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
110111
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
111112
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
112113
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -206,8 +207,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
206207
*:ekkoBSD:*:*)
207208
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
208209
exit ;;
210+
*:SolidBSD:*:*)
211+
echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
212+
exit ;;
209213
macppc:MirBSD:*:*)
210-
echo powerppc-unknown-mirbsd${UNAME_RELEASE}
214+
echo powerpc-unknown-mirbsd${UNAME_RELEASE}
211215
exit ;;
212216
*:MirBSD:*:*)
213217
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -767,6 +771,8 @@ EOF
767771
case ${UNAME_MACHINE} in
768772
pc98)
769773
echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
774+
amd64)
775+
echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
770776
*)
771777
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
772778
esac
@@ -784,8 +790,11 @@ EOF
784790
i*:PW*:*)
785791
echo ${UNAME_MACHINE}-pc-pw32
786792
exit ;;
787-
x86:Interix*:[345]*)
788-
echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
793+
x86:Interix*:[3456]*)
794+
echo i586-pc-interix${UNAME_RELEASE}
795+
exit ;;
796+
EM64T:Interix*:[3456]*)
797+
echo x86_64-unknown-interix${UNAME_RELEASE}
789798
exit ;;
790799
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
791800
echo i${UNAME_MACHINE}-pc-mks
@@ -822,6 +831,9 @@ EOF
822831
arm*:Linux:*:*)
823832
echo ${UNAME_MACHINE}-unknown-linux-gnu
824833
exit ;;
834+
avr32*:Linux:*:*)
835+
echo ${UNAME_MACHINE}-unknown-linux-gnu
836+
exit ;;
825837
cris:Linux:*:*)
826838
echo cris-axis-linux-gnu
827839
exit ;;
@@ -856,7 +868,11 @@ EOF
856868
#endif
857869
#endif
858870
EOF
859-
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
871+
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
872+
/^CPU/{
873+
s: ::g
874+
p
875+
}'`"
860876
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
861877
;;
862878
mips64:Linux:*:*)
@@ -875,7 +891,11 @@ EOF
875891
#endif
876892
#endif
877893
EOF
878-
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
894+
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
895+
/^CPU/{
896+
s: ::g
897+
p
898+
}'`"
879899
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
880900
;;
881901
or32:Linux:*:*)
@@ -972,7 +992,7 @@ EOF
972992
LIBC=gnulibc1
973993
# endif
974994
#else
975-
#if defined(__INTEL_COMPILER) || defined(__PGI)
995+
#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
976996
LIBC=gnu
977997
#else
978998
LIBC=gnuaout
@@ -982,7 +1002,11 @@ EOF
9821002
LIBC=dietlibc
9831003
#endif
9841004
EOF
985-
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`"
1005+
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
1006+
/^LIBC/{
1007+
s: ::g
1008+
p
1009+
}'`"
9861010
test x"${LIBC}" != x && {
9871011
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
9881012
exit

‎build-aux/config.sub‎

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#! /bin/sh
22
# Configuration validation subroutine script.
33
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4-
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
4+
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
5+
# Inc.
56

6-
timestamp='2005-12-23'
7+
timestamp='2006-07-02'
78

89
# This file is (in principle) common to ALL GNU software.
910
# The presence of a machine in this file suggests that SOME GNU software
@@ -240,15 +241,16 @@ case $basic_machine in
240241
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
241242
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
242243
| am33_2.0 \
243-
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
244+
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
244245
| bfin \
245246
| c4x | clipper \
246247
| d10v | d30v | dlx | dsp16xx \
247248
| fr30 | frv \
248249
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
249250
| i370 | i860 | i960 | ia64 \
250251
| ip2k | iq2000 \
251-
| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
252+
| m32c | m32r | m32rle | m68000 | m68k | m88k \
253+
| maxq | mb | microblaze | mcore \
252254
| mips | mipsbe | mipseb | mipsel | mipsle \
253255
| mips16 \
254256
| mips64 | mips64el \
@@ -268,26 +270,24 @@ case $basic_machine in
268270
| mn10200 | mn10300 \
269271
| mt \
270272
| msp430 \
273+
| nios | nios2 \
271274
| ns16k | ns32k \
272275
| or32 \
273276
| pdp10 | pdp11 | pj | pjl \
274277
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
275278
| pyramid \
276-
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
279+
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
277280
| sh64 | sh64le \
278-
| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
279-
| sparcv8 | sparcv9 | sparcv9b \
280-
| strongarm \
281+
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
282+
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
283+
| spu | strongarm \
281284
| tahoe | thumb | tic4x | tic80 | tron \
282285
| v850 | v850e \
283286
| we32k \
284287
| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
285288
| z8k)
286289
basic_machine=$basic_machine-unknown
287290
;;
288-
m32c)
289-
basic_machine=$basic_machine-unknown
290-
;;
291291
m6811 | m68hc11 | m6812 | m68hc12)
292292
# Motorola 68HC11/12.
293293
basic_machine=$basic_machine-unknown
@@ -317,7 +317,7 @@ case $basic_machine in
317317
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
318318
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
319319
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
320-
| avr-* \
320+
| avr-* | avr32-* \
321321
| bfin-* | bs2000-* \
322322
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
323323
| clipper-* | craynv-* | cydra-* \
@@ -328,7 +328,7 @@ case $basic_machine in
328328
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
329329
| i*86-* | i860-* | i960-* | ia64-* \
330330
| ip2k-* | iq2000-* \
331-
| m32r-* | m32rle-* \
331+
| m32c-* | m32r-* | m32rle-* \
332332
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
333333
| m88110-* | m88k-* | maxq-* | mcore-* \
334334
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -350,17 +350,18 @@ case $basic_machine in
350350
| mmix-* \
351351
| mt-* \
352352
| msp430-* \
353+
| nios-* | nios2-* \
353354
| none-* | np1-* | ns16k-* | ns32k-* \
354355
| orion-* \
355356
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
356357
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
357358
| pyramid-* \
358359
| romp-* | rs6000-* \
359-
| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
360+
| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
360361
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
361-
| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
362+
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
362363
| sparclite-* \
363-
| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
364+
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
364365
| tahoe-* | thumb-* \
365366
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
366367
| tron-* \
@@ -371,8 +372,6 @@ case $basic_machine in
371372
| ymp-* \
372373
| z8k-*)
373374
;;
374-
m32c-*)
375-
;;
376375
# Recognize the various machine names and aliases which stand
377376
# for a CPU type and a company and sometimes even an OS.
378377
386bsd)
@@ -1126,7 +1125,7 @@ case $basic_machine in
11261125
sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
11271126
basic_machine=sh-unknown
11281127
;;
1129-
sparc | sparcv8 | sparcv9 | sparcv9b)
1128+
sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
11301129
basic_machine=sparc-sun
11311130
;;
11321131
cydra)
@@ -1199,7 +1198,8 @@ case $os in
11991198
| -aos* \
12001199
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
12011200
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1202-
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
1201+
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
1202+
| -openbsd* | -solidbsd* \
12031203
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
12041204
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
12051205
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
@@ -1214,7 +1214,7 @@ case $os in
12141214
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
12151215
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
12161216
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1217-
| -skyos* | -haiku* | -rdos*)
1217+
| -skyos* | -haiku* | -rdos* | -toppers*)
12181218
# Remember, each alternative MUST END IN *, to match a version number.
12191219
;;
12201220
-qnx*)
@@ -1366,6 +1366,9 @@ else
13661366
# system, and we'll never get to this point.
13671367

13681368
case $basic_machine in
1369+
spu-*)
1370+
os=-elf
1371+
;;
13691372
*-acorn)
13701373
os=-riscix1.2
13711374
;;
@@ -1375,9 +1378,9 @@ case $basic_machine in
13751378
arm*-semi)
13761379
os=-aout
13771380
;;
1378-
c4x-* | tic4x-*)
1379-
os=-coff
1380-
;;
1381+
c4x-* | tic4x-*)
1382+
os=-coff
1383+
;;
13811384
# This must come before the *-dec entry.
13821385
pdp10-*)
13831386
os=-tops20

0 commit comments

Comments
 (0)