Skip to content

Commit f7c6d9f

Browse files
author
Sascha Schumann
committedNov 14, 2002
upgrade files to libtool 1.4.3 shipped ones
# should be safe to upgrade these to the 1.5.x ones
1 parent 8efbeb6 commit f7c6d9f

File tree

2 files changed

+138
-73
lines changed

2 files changed

+138
-73
lines changed
 

‎config.guess

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

6-
timestamp='2002-05-29'
6+
timestamp='2002-10-21'
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
@@ -88,30 +88,40 @@ if test $# != 0; then
8888
exit 1
8989
fi
9090

91+
trap 'exit 1' 1 2 15
9192

92-
dummy=dummy-$$
93-
trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
93+
# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
94+
# compiler to aid in system detection is discouraged as it requires
95+
# temporary files to be created and, as you can see below, it is a
96+
# headache to deal with in a portable fashion.
9497

95-
# CC_FOR_BUILD -- compiler used by this script.
9698
# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
9799
# use `HOST_CC' if defined, but it is deprecated.
98100

99-
set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
100-
,,) echo "int dummy(){}" > $dummy.c ;
101+
# This shell variable is my proudest work .. or something. --bje
102+
103+
set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ;
104+
(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old)
105+
|| (echo "$me: cannot create $tmpdir" >&2 && exit 1) ;
106+
dummy=$tmpdir/dummy ;
107+
files="$dummy.c $dummy.o $dummy.rel $dummy" ;
108+
trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
109+
case $CC_FOR_BUILD,$HOST_CC,$CC in
110+
,,) echo "int x;" > $dummy.c ;
101111
for c in cc gcc c89 c99 ; do
102-
($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
103-
if test $? = 0 ; then
112+
if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
104113
CC_FOR_BUILD="$c"; break ;
105114
fi ;
106115
done ;
107-
rm -f $dummy.c $dummy.o $dummy.rel ;
116+
rm -f $files ;
108117
if test x"$CC_FOR_BUILD" = x ; then
109118
CC_FOR_BUILD=no_compiler_found ;
110119
fi
111120
;;
112121
,,*) CC_FOR_BUILD=$CC ;;
113122
,*,*) CC_FOR_BUILD=$HOST_CC ;;
114-
esac'
123+
esac ;
124+
unset files'
115125

116126
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
117127
# (ghazi@noc.rutgers.edu 1994-08-24)
@@ -221,6 +231,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
221231
# A Tn.n version is a released field test version.
222232
# A Xn.n version is an unreleased experimental baselevel.
223233
# 1.2 uses "1.2" for uname -r.
234+
eval $set_cc_for_build
224235
cat <<EOF >$dummy.s
225236
.data
226237
\$Lformat:
@@ -246,10 +257,9 @@ main:
246257
jsr \$26,exit
247258
.end main
248259
EOF
249-
eval $set_cc_for_build
250-
$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
260+
$CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
251261
if test "$?" = 0 ; then
252-
case `./$dummy` in
262+
case `$dummy` in
253263
0-0)
254264
UNAME_MACHINE="alpha"
255265
;;
@@ -271,9 +281,12 @@ EOF
271281
2-1307)
272282
UNAME_MACHINE="alphaev68"
273283
;;
284+
3-1307)
285+
UNAME_MACHINE="alphaev7"
286+
;;
274287
esac
275288
fi
276-
rm -f $dummy.s $dummy
289+
rm -f $dummy.s $dummy && rmdir $tmpdir
277290
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
278291
exit 0 ;;
279292
Alpha\ *:Windows_NT*:*)
@@ -314,6 +327,10 @@ EOF
314327
NILE*:*:*:dcosx)
315328
echo pyramid-pyramid-svr4
316329
exit 0 ;;
330+
DRS?6000:UNIX_SV:4.2*:7*)
331+
case `/usr/bin/uname -p` in
332+
sparc) echo sparc-icl-nx7 && exit 0 ;;
333+
esac ;;
317334
sun4H:SunOS:5.*:*)
318335
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
319336
exit 0 ;;
@@ -420,15 +437,18 @@ EOF
420437
exit (-1);
421438
}
422439
EOF
423-
$CC_FOR_BUILD $dummy.c -o $dummy \
424-
&& ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
425-
&& rm -f $dummy.c $dummy && exit 0
426-
rm -f $dummy.c $dummy
440+
$CC_FOR_BUILD -o $dummy $dummy.c \
441+
&& $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
442+
&& rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
443+
rm -f $dummy.c $dummy && rmdir $tmpdir
427444
echo mips-mips-riscos${UNAME_RELEASE}
428445
exit 0 ;;
429446
Motorola:PowerMAX_OS:*:*)
430447
echo powerpc-motorola-powermax
431448
exit 0 ;;
449+
Motorola:*:4.3:PL8-*)
450+
echo powerpc-harris-powermax
451+
exit 0 ;;
432452
Night_Hawk:*:*:PowerMAX_OS)
433453
echo powerpc-harris-powermax
434454
exit 0 ;;
@@ -504,8 +524,8 @@ EOF
504524
exit(0);
505525
}
506526
EOF
507-
$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
508-
rm -f $dummy.c $dummy
527+
$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
528+
rm -f $dummy.c $dummy && rmdir $tmpdir
509529
echo rs6000-ibm-aix3.2.5
510530
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
511531
echo rs6000-ibm-aix3.2.4
@@ -603,9 +623,9 @@ EOF
603623
exit (0);
604624
}
605625
EOF
606-
(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
626+
(CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
607627
if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
608-
rm -f $dummy.c $dummy
628+
rm -f $dummy.c $dummy && rmdir $tmpdir
609629
fi ;;
610630
esac
611631
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -641,8 +661,8 @@ EOF
641661
exit (0);
642662
}
643663
EOF
644-
$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
645-
rm -f $dummy.c $dummy
664+
$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
665+
rm -f $dummy.c $dummy && rmdir $tmpdir
646666
echo unknown-hitachi-hiuxwe2
647667
exit 0 ;;
648668
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -725,7 +745,19 @@ EOF
725745
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
726746
exit 0 ;;
727747
*:FreeBSD:*:*)
728-
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
748+
# Determine whether the default compiler uses glibc.
749+
eval $set_cc_for_build
750+
sed 's/^ //' << EOF >$dummy.c
751+
#include <features.h>
752+
#if __GLIBC__ >= 2
753+
LIBC=gnu
754+
#else
755+
LIBC=
756+
#endif
757+
EOF
758+
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
759+
rm -f $dummy.c && rmdir $tmpdir
760+
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
729761
exit 0 ;;
730762
i*:CYGWIN*:*)
731763
echo ${UNAME_MACHINE}-pc-cygwin
@@ -786,7 +818,7 @@ EOF
786818
#endif
787819
EOF
788820
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
789-
rm -f $dummy.c
821+
rm -f $dummy.c && rmdir $tmpdir
790822
test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
791823
;;
792824
ppc:Linux:*:*)
@@ -849,7 +881,7 @@ EOF
849881
;;
850882
a.out-i386-linux)
851883
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
852-
exit 0 ;;
884+
exit 0 ;;
853885
coff-i386)
854886
echo "${UNAME_MACHINE}-pc-linux-gnucoff"
855887
exit 0 ;;
@@ -882,7 +914,7 @@ EOF
882914
#endif
883915
EOF
884916
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
885-
rm -f $dummy.c
917+
rm -f $dummy.c && rmdir $tmpdir
886918
test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
887919
test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
888920
;;
@@ -960,6 +992,9 @@ EOF
960992
# "miniframe"
961993
echo m68010-convergent-sysv
962994
exit 0 ;;
995+
mc68k:UNIX:SYSTEM5:3.51m)
996+
echo m68k-convergent-sysv
997+
exit 0 ;;
963998
M68*:*:R3V[567]*:*)
964999
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
9651000
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 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
@@ -1053,6 +1088,9 @@ EOF
10531088
SX-5:SUPER-UX:*:*)
10541089
echo sx5-nec-superux${UNAME_RELEASE}
10551090
exit 0 ;;
1091+
SX-6:SUPER-UX:*:*)
1092+
echo sx6-nec-superux${UNAME_RELEASE}
1093+
exit 0 ;;
10561094
Power*:Rhapsody:*:*)
10571095
echo powerpc-apple-rhapsody${UNAME_RELEASE}
10581096
exit 0 ;;
@@ -1073,7 +1111,7 @@ EOF
10731111
*:QNX:*:4*)
10741112
echo i386-pc-qnx
10751113
exit 0 ;;
1076-
NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
1114+
NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
10771115
echo nsr-tandem-nsk${UNAME_RELEASE}
10781116
exit 0 ;;
10791117
*:NonStop-UX:*:*)
@@ -1245,8 +1283,8 @@ main ()
12451283
}
12461284
EOF
12471285

1248-
$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
1249-
rm -f $dummy.c $dummy
1286+
$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
1287+
rm -f $dummy.c $dummy && rmdir $tmpdir
12501288

12511289
# Apollos put the system type in the environment.
12521290

0 commit comments

Comments
 (0)
Please sign in to comment.