Skip to content

Commit e4e7960

Browse files
author
foobar
committed
- Upgrade bundled libtool to 1.4.2. Following stuff mentioned at:
 http://www.gnu.org/software/libtool/news.html * Diagnose and warn about not-quite-working combinations of gcc and ld on Solaris. * Improved OpenBSD support. * Improved cygwin support. * Bugfixes.
1 parent f24cb97 commit e4e7960

File tree

3 files changed

+166
-125
lines changed

3 files changed

+166
-125
lines changed

‎config.guess

+66-57
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
44
# Free Software Foundation, Inc.
55

6-
timestamp='2001-11-08'
6+
timestamp='2001-09-04'
77

88
# This file is free software; you can redistribute it and/or modify it
99
# under the terms of the GNU General Public License as published by
@@ -24,9 +24,8 @@ timestamp='2001-11-08'
2424
# configuration script generated by Autoconf, you may include it under
2525
# the same distribution terms that you use for the rest of that program.
2626

27-
# Originally written by Per Bothner <[email protected]>.
28-
# Please send patches to <[email protected]>. Submit a context
29-
# diff and a properly formatted ChangeLog entry.
27+
# Written by Per Bothner <[email protected]>.
28+
# Please send patches to <[email protected]>.
3029
#
3130
# This script attempts to guess a canonical system name similar to
3231
# config.sub. If it succeeds, it prints the system name on stdout, and
@@ -128,7 +127,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
128127

129128
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
130129
*:NetBSD:*:*)
131-
# NetBSD (nbsd) targets should (where applicable) match one or
130+
# Netbsd (nbsd) targets should (where applicable) match one or
132131
# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
133132
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
134133
# switched to ELF, *-*-netbsd* would select the old
@@ -145,7 +144,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
145144
macppc) machine=powerpc-apple ;;
146145
hp3[0-9][05]) machine=m68k-hp ;;
147146
ibmrt|romp-ibm) machine=romp-ibm ;;
148-
sparc*) machine=`uname -p`-unknown ;;
149147
*) machine=${UNAME_MACHINE}-unknown ;;
150148
esac
151149
# The Operating System including object format, if it has switched
@@ -174,45 +172,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
174172
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
175173
echo "${machine}-${os}${release}"
176174
exit 0 ;;
177-
amiga:OpenBSD:*:*)
178-
echo m68k-unknown-openbsd${UNAME_RELEASE}
179-
exit 0 ;;
180-
arc:OpenBSD:*:*)
181-
echo mipsel-unknown-openbsd${UNAME_RELEASE}
182-
exit 0 ;;
183-
hp300:OpenBSD:*:*)
184-
echo m68k-unknown-openbsd${UNAME_RELEASE}
185-
exit 0 ;;
186-
mac68k:OpenBSD:*:*)
187-
echo m68k-unknown-openbsd${UNAME_RELEASE}
188-
exit 0 ;;
189-
macppc:OpenBSD:*:*)
190-
echo powerpc-unknown-openbsd${UNAME_RELEASE}
191-
exit 0 ;;
192-
mvme68k:OpenBSD:*:*)
193-
echo m68k-unknown-openbsd${UNAME_RELEASE}
194-
exit 0 ;;
195-
mvme88k:OpenBSD:*:*)
196-
echo m88k-unknown-openbsd${UNAME_RELEASE}
197-
exit 0 ;;
198-
mvmeppc:OpenBSD:*:*)
199-
echo powerpc-unknown-openbsd${UNAME_RELEASE}
200-
exit 0 ;;
201-
pmax:OpenBSD:*:*)
202-
echo mipsel-unknown-openbsd${UNAME_RELEASE}
203-
exit 0 ;;
204-
sgi:OpenBSD:*:*)
205-
echo mipseb-unknown-openbsd${UNAME_RELEASE}
206-
exit 0 ;;
207-
sun3:OpenBSD:*:*)
208-
echo m68k-unknown-openbsd${UNAME_RELEASE}
209-
exit 0 ;;
210-
wgrisc:OpenBSD:*:*)
211-
echo mipsel-unknown-openbsd${UNAME_RELEASE}
212-
exit 0 ;;
213-
*:OpenBSD:*:*)
214-
echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
215-
exit 0 ;;
216175
alpha:OSF1:*:*)
217176
if test $UNAME_RELEASE = "V4.0"; then
218177
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -288,9 +247,30 @@ EOF
288247
Amiga*:UNIX_System_V:4.0:*)
289248
echo m68k-unknown-sysv4
290249
exit 0;;
250+
amiga:OpenBSD:*:*)
251+
echo m68k-unknown-openbsd${UNAME_RELEASE}
252+
exit 0 ;;
291253
*:[Aa]miga[Oo][Ss]:*:*)
292254
echo ${UNAME_MACHINE}-unknown-amigaos
293255
exit 0 ;;
256+
arc64:OpenBSD:*:*)
257+
echo mips64el-unknown-openbsd${UNAME_RELEASE}
258+
exit 0 ;;
259+
arc:OpenBSD:*:*)
260+
echo mipsel-unknown-openbsd${UNAME_RELEASE}
261+
exit 0 ;;
262+
hkmips:OpenBSD:*:*)
263+
echo mips-unknown-openbsd${UNAME_RELEASE}
264+
exit 0 ;;
265+
pmax:OpenBSD:*:*)
266+
echo mipsel-unknown-openbsd${UNAME_RELEASE}
267+
exit 0 ;;
268+
sgi:OpenBSD:*:*)
269+
echo mips-unknown-openbsd${UNAME_RELEASE}
270+
exit 0 ;;
271+
wgrisc:OpenBSD:*:*)
272+
echo mipsel-unknown-openbsd${UNAME_RELEASE}
273+
exit 0 ;;
294274
*:OS/390:*:*)
295275
echo i370-ibm-openedition
296276
exit 0 ;;
@@ -353,6 +333,12 @@ EOF
353333
aushp:SunOS:*:*)
354334
echo sparc-auspex-sunos${UNAME_RELEASE}
355335
exit 0 ;;
336+
sparc*:NetBSD:*)
337+
echo `uname -p`-unknown-netbsd${UNAME_RELEASE}
338+
exit 0 ;;
339+
atari*:OpenBSD:*:*)
340+
echo m68k-unknown-openbsd${UNAME_RELEASE}
341+
exit 0 ;;
356342
# The situation for MiNT is a little confusing. The machine name
357343
# can be virtually everything (everything which is not
358344
# "atarist" or "atariste" at least should have a processor
@@ -379,6 +365,18 @@ EOF
379365
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
380366
echo m68k-unknown-mint${UNAME_RELEASE}
381367
exit 0 ;;
368+
sun3*:OpenBSD:*:*)
369+
echo m68k-unknown-openbsd${UNAME_RELEASE}
370+
exit 0 ;;
371+
mac68k:OpenBSD:*:*)
372+
echo m68k-unknown-openbsd${UNAME_RELEASE}
373+
exit 0 ;;
374+
mvme68k:OpenBSD:*:*)
375+
echo m68k-unknown-openbsd${UNAME_RELEASE}
376+
exit 0 ;;
377+
mvme88k:OpenBSD:*:*)
378+
echo m88k-unknown-openbsd${UNAME_RELEASE}
379+
exit 0 ;;
382380
powerpc:machten:*:*)
383381
echo powerpc-apple-machten${UNAME_RELEASE}
384382
exit 0 ;;
@@ -548,8 +546,10 @@ EOF
548546
9000/31? ) HP_ARCH=m68000 ;;
549547
9000/[34]?? ) HP_ARCH=m68k ;;
550548
9000/[678][0-9][0-9])
551-
if [ -x /usr/bin/getconf ]; then
552-
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
549+
case "${HPUX_REV}" in
550+
11.[0-9][0-9])
551+
if [ -x /usr/bin/getconf ]; then
552+
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
553553
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
554554
case "${sc_cpu_version}" in
555555
523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
@@ -558,13 +558,13 @@ EOF
558558
case "${sc_kernel_bits}" in
559559
32) HP_ARCH="hppa2.0n" ;;
560560
64) HP_ARCH="hppa2.0w" ;;
561-
'') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
562561
esac ;;
563562
esac
564-
fi
565-
if [ "${HP_ARCH}" = "" ]; then
566-
eval $set_cc_for_build
567-
sed 's/^ //' << EOF >$dummy.c
563+
fi ;;
564+
esac
565+
if [ "${HP_ARCH}" = "" ]; then
566+
eval $set_cc_for_build
567+
sed 's/^ //' << EOF >$dummy.c
568568
569569
#define _HPUX_SOURCE
570570
#include <stdlib.h>
@@ -597,10 +597,10 @@ EOF
597597
exit (0);
598598
}
599599
EOF
600-
(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
601-
if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
602-
rm -f $dummy.c $dummy
603-
fi ;;
600+
(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
601+
if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
602+
rm -f $dummy.c $dummy
603+
fi ;;
604604
esac
605605
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
606606
exit 0 ;;
@@ -664,6 +664,9 @@ EOF
664664
parisc*:Lites*:*:*)
665665
echo hppa1.1-hp-lites
666666
exit 0 ;;
667+
hppa*:OpenBSD:*:*)
668+
echo hppa-unknown-openbsd
669+
exit 0 ;;
667670
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
668671
echo c1-convex-bsd
669672
exit 0 ;;
@@ -715,6 +718,9 @@ EOF
715718
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
716719
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
717720
exit 0 ;;
721+
hp300:OpenBSD:*:*)
722+
echo m68k-unknown-openbsd${UNAME_RELEASE}
723+
exit 0 ;;
718724
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
719725
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
720726
exit 0 ;;
@@ -727,6 +733,9 @@ EOF
727733
*:FreeBSD:*:*)
728734
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
729735
exit 0 ;;
736+
*:OpenBSD:*:*)
737+
echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
738+
exit 0 ;;
730739
i*:CYGWIN*:*)
731740
echo ${UNAME_MACHINE}-pc-cygwin
732741
exit 0 ;;
@@ -947,7 +956,7 @@ EOF
947956
exit 0 ;;
948957
M68*:*:R3V[567]*:*)
949958
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
950-
3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
959+
3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
951960
OS_REL=''
952961
test -r /etc/.relid \
953962
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`

‎config.sub

+12-18
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
44
# Free Software Foundation, Inc.
55

6-
timestamp='2001-11-08'
6+
timestamp='2001-09-07'
77

88
# This file is (in principle) common to ALL GNU software.
99
# The presence of a machine in this file suggests that SOME GNU software
@@ -29,8 +29,7 @@ timestamp='2001-11-08'
2929
# configuration script generated by Autoconf, you may include it under
3030
# the same distribution terms that you use for the rest of that program.
3131

32-
# Please send patches to <[email protected]>. Submit a context
33-
# diff and a properly formatted ChangeLog entry.
32+
# Please send patches to <[email protected]>.
3433
#
3534
# Configuration subroutine to validate and canonicalize a configuration type.
3635
# Supply the specified configuration type as an argument.
@@ -245,13 +244,14 @@ case $basic_machine in
245244
| pdp10 | pdp11 | pj | pjl \
246245
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
247246
| pyramid \
247+
| s390 | s390x \
248248
| sh | sh[34] | sh[34]eb | shbe | shle \
249249
| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
250-
| strongarm \
250+
| stormy16 | strongarm \
251251
| tahoe | thumb | tic80 | tron \
252252
| v850 \
253253
| we32k \
254-
| x86 | xscale | xstormy16 \
254+
| x86 | xscale \
255255
| z8k)
256256
basic_machine=$basic_machine-unknown
257257
;;
@@ -280,7 +280,6 @@ case $basic_machine in
280280
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
281281
| alphapca5[67]-* | arc-* \
282282
| arm-* | armbe-* | armle-* | armv*-* \
283-
| avr-* \
284283
| bs2000-* \
285284
| c[123]* | c30-* | [cjt]90-* | c54x-* \
286285
| clipper-* | cray2-* | cydra-* \
@@ -303,13 +302,14 @@ case $basic_machine in
303302
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
304303
| pyramid-* \
305304
| romp-* | rs6000-* \
305+
| s390-* | s390x-* \
306306
| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
307307
| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
308-
| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* \
308+
| sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
309309
| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
310310
| v850-* | vax-* \
311311
| we32k-* \
312-
| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* | xstormy16-* \
312+
| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
313313
| ymp-* \
314314
| z8k-*)
315315
;;
@@ -724,7 +724,7 @@ case $basic_machine in
724724
pc532 | pc532-*)
725725
basic_machine=ns32k-pc532
726726
;;
727-
pentium | p5 | k5 | k6 | nexgen | viac3)
727+
pentium | p5 | k5 | k6 | nexgen)
728728
basic_machine=i586-pc
729729
;;
730730
pentiumpro | p6 | 6x86 | athlon)
@@ -733,7 +733,7 @@ case $basic_machine in
733733
pentiumii | pentium2)
734734
basic_machine=i686-pc
735735
;;
736-
pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
736+
pentium-* | p5-* | k5-* | k6-* | nexgen-*)
737737
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
738738
;;
739739
pentiumpro-* | p6-* | 6x86-* | athlon-*)
@@ -784,12 +784,6 @@ case $basic_machine in
784784
rtpc | rtpc-*)
785785
basic_machine=romp-ibm
786786
;;
787-
s390 | s390-*)
788-
basic_machine=s390-ibm
789-
;;
790-
s390x | s390x-*)
791-
basic_machine=s390x-ibm
792-
;;
793787
sa29200)
794788
basic_machine=a29k-amd
795789
os=-udi
@@ -801,7 +795,7 @@ case $basic_machine in
801795
basic_machine=sh-hitachi
802796
os=-hms
803797
;;
804-
sparclite-wrs | simso-wrs)
798+
sparclite-wrs)
805799
basic_machine=sparclite-wrs
806800
os=-vxworks
807801
;;
@@ -1074,7 +1068,7 @@ case $os in
10741068
| -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
10751069
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
10761070
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1077-
| -os2* | -vos* | -palmos* | -uclinux*)
1071+
| -os2* | -vos*)
10781072
# Remember, each alternative MUST END IN *, to match a version number.
10791073
;;
10801074
-qnx*)

0 commit comments

Comments
 (0)