Skip to content

Commit 3ae459b

Browse files
author
Sascha Schumann
committed
Fix ltconfig, ltmain.sh
Update config.sub, config.guess from libtool-1.3.4
1 parent 41392f5 commit 3ae459b

File tree

4 files changed

+194
-56
lines changed

4 files changed

+194
-56
lines changed

‎config.guess

+64-31
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
# Written by Per Bothner <[email protected]>.
2626
# The master version of this file is at the FSF in /home/gd/gnu/lib.
27-
# Please send patches to the Autoconf mailing list <[email protected]>.
27+
# Please send patches to <autoconf-patches@gnu.org>.
2828
#
2929
# This script attempts to guess a canonical system name similar to
3030
# config.sub. If it succeeds, it prints the system name on stdout, and
@@ -156,6 +156,9 @@ EOF
156156
wgrisc:OpenBSD:*:*)
157157
echo mipsel-unknown-openbsd${UNAME_RELEASE}
158158
exit 0 ;;
159+
*:OS/390:*:*)
160+
echo i370-ibm-openedition
161+
exit 0 ;;
159162
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
160163
echo arm-acorn-riscix${UNAME_RELEASE}
161164
exit 0;;
@@ -328,15 +331,18 @@ EOF
328331
AViiON:dgux:*:*)
329332
# DG/UX returns AViiON for all architectures
330333
UNAME_PROCESSOR=`/usr/bin/uname -p`
331-
if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
332-
if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
333-
-o ${TARGET_BINARY_INTERFACE}x = x ] ; then
334+
if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110]
335+
then
336+
if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
337+
[ ${TARGET_BINARY_INTERFACE}x = x ]
338+
then
334339
echo m88k-dg-dgux${UNAME_RELEASE}
335-
else
340+
else
336341
echo m88k-dg-dguxbcs${UNAME_RELEASE}
342+
fi
343+
else
344+
echo i586-dg-dgux${UNAME_RELEASE}
337345
fi
338-
else echo i586-dg-dgux${UNAME_RELEASE}
339-
fi
340346
exit 0 ;;
341347
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
342348
echo m88k-dolphin-sysv3
@@ -453,7 +459,7 @@ EOF
453459
exit (0);
454460
}
455461
EOF
456-
($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
462+
(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
457463
rm -f $dummy.c $dummy
458464
esac
459465
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
@@ -550,7 +556,7 @@ EOF
550556
echo t90-cray-unicos${UNAME_RELEASE}
551557
exit 0 ;;
552558
CRAY*T3E:*:*:*)
553-
echo t3e-cray-unicosmk${UNAME_RELEASE}
559+
echo alpha-cray-unicosmk${UNAME_RELEASE}
554560
exit 0 ;;
555561
CRAY-2:*:*:*)
556562
echo cray2-cray-unicos
@@ -588,7 +594,7 @@ EOF
588594
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
589595
exit 0 ;;
590596
*:NetBSD:*:*)
591-
echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
597+
echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
592598
exit 0 ;;
593599
*:OpenBSD:*:*)
594600
echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
@@ -618,12 +624,6 @@ EOF
618624
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
619625
exit 0 ;;
620626
*:Linux:*:*)
621-
# # uname on the ARM produces all sorts of strangeness, and we need to
622-
# # filter it out.
623-
# case "$UNAME_MACHINE" in
624-
# armv*) UNAME_MACHINE=$UNAME_MACHINE ;;
625-
# arm* | sa110*) UNAME_MACHINE="arm" ;;
626-
# esac
627627

628628
# The BFD linker knows what the default object file format is, so
629629
# first see if it will tell us. cd to the root directory to prevent
@@ -636,12 +636,38 @@ EOF
636636
s/ .*//
637637
p'`
638638
case "$ld_supported_emulations" in
639-
i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;;
640-
i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;;
641-
sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
642-
armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
643-
m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
644-
elf32arm) echo "${UNAME_MACHINE}-unknown-linux-gnu" ; exit 0 ;;
639+
*ia64)
640+
echo "${UNAME_MACHINE}-unknown-linux"
641+
exit 0
642+
;;
643+
i?86linux)
644+
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
645+
exit 0
646+
;;
647+
i?86coff)
648+
echo "${UNAME_MACHINE}-pc-linux-gnucoff"
649+
exit 0
650+
;;
651+
sparclinux)
652+
echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
653+
exit 0
654+
;;
655+
armlinux)
656+
echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
657+
exit 0
658+
;;
659+
elf32arm*)
660+
echo "${UNAME_MACHINE}-unknown-linux-gnu"
661+
exit 0
662+
;;
663+
armelf_linux*)
664+
echo "${UNAME_MACHINE}-unknown-linux-gnu"
665+
exit 0
666+
;;
667+
m68klinux)
668+
echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
669+
exit 0
670+
;;
645671
elf32ppc)
646672
# Determine Lib Version
647673
cat >$dummy.c <<EOF
@@ -671,7 +697,9 @@ EOF
671697
fi
672698
fi
673699
rm -f $dummy.c $dummy
674-
echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;;
700+
echo powerpc-unknown-linux-gnu${LIBC}
701+
exit 0
702+
;;
675703
esac
676704

677705
if test "${UNAME_MACHINE}" = "alpha" ; then
@@ -798,19 +826,21 @@ EOF
798826
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
799827
exit 0 ;;
800828
i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
829+
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
801830
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
802-
echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
831+
echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
803832
else
804-
echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
833+
echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
805834
fi
806835
exit 0 ;;
807836
i?86:*:5:7*)
808-
UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
809-
(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
810-
(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586
811-
(/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686
812-
(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585
813-
echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
837+
# Fixed at (any) Pentium or better
838+
UNAME_MACHINE=i586
839+
if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
840+
echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
841+
else
842+
echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
843+
fi
814844
exit 0 ;;
815845
i?86:*:3.2:*)
816846
if test -f /usr/options/cb.name; then
@@ -944,6 +974,9 @@ EOF
944974
*:Rhapsody:*:*)
945975
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
946976
exit 0 ;;
977+
*:QNX:*:4*)
978+
echo i386-qnx-qnx${UNAME_VERSION}
979+
exit 0 ;;
947980
esac
948981

949982
#echo '(No uname command or uname output not recognized.)' 1>&2

‎config.sub

+32-16
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ case $os in
105105
-scout)
106106
;;
107107
-wrs)
108-
os=vxworks
108+
os=-vxworks
109109
basic_machine=$1
110110
;;
111111
-hiux*)
@@ -156,13 +156,17 @@ case $os in
156156
-psos*)
157157
os=-psos
158158
;;
159+
-mint | -mint[0-9]*)
160+
basic_machine=m68k-atari
161+
os=-mint
162+
;;
159163
esac
160164

161165
# Decode aliases for certain CPU-COMPANY combinations.
162166
case $basic_machine in
163167
# Recognize the basic CPU types without company name.
164168
# Some are omitted here because they have special meanings below.
165-
tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
169+
tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
166170
| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
167171
| 580 | i960 | h8300 \
168172
| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
@@ -171,12 +175,12 @@ case $basic_machine in
171175
| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
172176
| mips64orion | mips64orionel | mipstx39 | mipstx39el \
173177
| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
174-
| mips64vr5000 | miprs64vr5000el \
175-
| armv[34][lb] | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
176-
| thumb | d10v)
178+
| mips64vr5000 | miprs64vr5000el | mcore \
179+
| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
180+
| thumb | d10v | fr30)
177181
basic_machine=$basic_machine-unknown
178182
;;
179-
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
183+
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
180184
;;
181185

182186
# We use `pc' rather than `unknown'
@@ -191,7 +195,8 @@ case $basic_machine in
191195
exit 1
192196
;;
193197
# Recognize the basic CPU types with company name.
194-
vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
198+
# FIXME: clean up the formatting here.
199+
vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
195200
| m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
196201
| mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
197202
| power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
@@ -204,11 +209,10 @@ case $basic_machine in
204209
| sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
205210
| mips64el-* | mips64orion-* | mips64orionel-* \
206211
| mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
207-
| mipstx39-* | mipstx39el-* \
208-
| armv[34][lb]-* \
212+
| mipstx39-* | mipstx39el-* | mcore-* \
209213
| f301-* | armv*-* | t3e-* \
210214
| m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
211-
| thumb-* | v850-* | d30v-* | tic30-* | c30-* )
215+
| thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* )
212216
;;
213217
# Recognize the various machine names and aliases which stand
214218
# for a CPU type and a company and sometimes even an OS.
@@ -426,7 +430,6 @@ case $basic_machine in
426430
;;
427431
i370-ibm* | ibm*)
428432
basic_machine=i370-ibm
429-
os=-mvs
430433
;;
431434
# I'm not sure what "Sysv32" means. Should this be sysv3.2?
432435
i[34567]86v32)
@@ -461,6 +464,9 @@ case $basic_machine in
461464
basic_machine=i386-unknown
462465
os=-mingw32
463466
;;
467+
i386-qnx | qnx)
468+
basic_machine=i386-qnx
469+
;;
464470
iris | iris4d)
465471
basic_machine=mips-sgi
466472
case $os in
@@ -489,7 +495,7 @@ case $basic_machine in
489495
miniframe)
490496
basic_machine=m68000-convergent
491497
;;
492-
*mint | *MiNT)
498+
*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
493499
basic_machine=m68k-atari
494500
os=-mint
495501
;;
@@ -515,6 +521,10 @@ case $basic_machine in
515521
basic_machine=i386-unknown
516522
os=-msdos
517523
;;
524+
mvs)
525+
basic_machine=i370-ibm
526+
os=-mvs
527+
;;
518528
ncr3000)
519529
basic_machine=i486-ncr
520530
os=-sysv4
@@ -524,7 +534,7 @@ case $basic_machine in
524534
os=-netbsd
525535
;;
526536
netwinder)
527-
basic_machine=armv4l-corel
537+
basic_machine=armv4l-rebel
528538
os=-linux
529539
;;
530540
news | news700 | news800 | news900)
@@ -908,7 +918,7 @@ case $os in
908918
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
909919
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
910920
| -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
911-
| -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
921+
| -interix* | -uwin* | -rhapsody* | -opened* | -openstep* | -oskit*)
912922
# Remember, each alternative MUST END IN *, to match a version number.
913923
;;
914924
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
@@ -927,6 +937,9 @@ case $os in
927937
-sunos6*)
928938
os=`echo $os | sed -e 's|sunos6|solaris3|'`
929939
;;
940+
-opened*)
941+
os=-openedition
942+
;;
930943
-osfrose*)
931944
os=-osfrose
932945
;;
@@ -964,6 +977,9 @@ case $os in
964977
-oss*)
965978
os=-sysv3
966979
;;
980+
-qnx)
981+
os=-qnx4
982+
;;
967983
-svr4)
968984
os=-sysv4
969985
;;
@@ -1013,7 +1029,7 @@ case $basic_machine in
10131029
*-acorn)
10141030
os=-riscix1.2
10151031
;;
1016-
arm*-corel)
1032+
arm*-rebel)
10171033
os=-linux
10181034
;;
10191035
arm*-semi)
@@ -1187,7 +1203,7 @@ case $basic_machine in
11871203
-genix*)
11881204
vendor=ns
11891205
;;
1190-
-mvs*)
1206+
-mvs* | -opened*)
11911207
vendor=ibm
11921208
;;
11931209
-ptx*)

‎ltconfig

+8-8
Original file line numberDiff line numberDiff line change
@@ -1188,8 +1188,8 @@ EOF
11881188

11891189
netbsd*)
11901190
if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
1191-
archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
1192-
archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
1191+
archive_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
1192+
archive_expsym_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
11931193
else
11941194
archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
11951195
# can we support soname and/or expsyms with a.out? -oliva
@@ -1210,8 +1210,8 @@ EOF
12101210
12111211
EOF
12121212
elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
1213-
archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
1214-
archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
1213+
archive_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
1214+
archive_expsym_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
12151215
else
12161216
ld_shlibs=no
12171217
fi
@@ -1226,8 +1226,8 @@ EOF
12261226

12271227
*)
12281228
if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
1229-
archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
1230-
archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
1229+
archive_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
1230+
archive_expsym_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
12311231
else
12321232
ld_shlibs=no
12331233
fi
@@ -1428,9 +1428,9 @@ else
14281428
no_undefined_flag=' -z text'
14291429
# $CC -shared without GNU ld will not create a library from C++
14301430
# object files and a static libstdc++, better avoid it by now
1431-
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
1431+
archive_cmds='$LD $compile_rpath -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
14321432
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
1433-
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp'
1433+
$LD $compile_rpath -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp'
14341434
hardcode_libdir_flag_spec='-R$libdir'
14351435
hardcode_shlibpath_var=no
14361436
case "$host_os" in

0 commit comments

Comments
 (0)