PR binutils/1990
* libtool.m4: Synchronize with version in GCC sources.
This commit is contained in:
Nick Clifton
parent
192af6e283
commit
018330f0a4
@ -1,3 +1,8 @@
|
||||
2005-12-27 Nick Clifton <nickc@redhat.com>
|
||||
|
||||
PR binutils/1990
|
||||
* libtool.m4: Synchronize with version in GCC sources.
|
||||
|
||||
2005-12-20 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
Revert Ada-related part of the previous change.
|
||||
|
||||
117
libtool.m4
vendored
117
libtool.m4
vendored
@ -103,6 +103,8 @@ AC_REQUIRE([AC_OBJEXT])dnl
|
||||
AC_REQUIRE([AC_EXEEXT])dnl
|
||||
dnl
|
||||
|
||||
AC_LIBTOOL_SYS_MAX_CMD_LEN
|
||||
|
||||
# Only perform the check for file, if the check method requires it
|
||||
case $deplibs_check_method in
|
||||
file_magic*)
|
||||
@ -189,6 +191,48 @@ ia64-*-hpux*)
|
||||
rm -rf conftest*
|
||||
;;
|
||||
|
||||
x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
|
||||
# Find out which ABI we are using.
|
||||
echo 'int i;' > conftest.$ac_ext
|
||||
if AC_TRY_EVAL(ac_compile); then
|
||||
case "`/usr/bin/file conftest.o`" in
|
||||
*32-bit*)
|
||||
case $host in
|
||||
x86_64-*linux*)
|
||||
LD="${LD-ld} -m elf_i386"
|
||||
;;
|
||||
ppc64-*linux*|powerpc64-*linux*)
|
||||
LD="${LD-ld} -m elf32ppclinux"
|
||||
;;
|
||||
s390x-*linux*)
|
||||
LD="${LD-ld} -m elf_s390"
|
||||
;;
|
||||
sparc64-*linux*)
|
||||
LD="${LD-ld} -m elf32_sparc"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
*64-bit*)
|
||||
case $host in
|
||||
x86_64-*linux*)
|
||||
LD="${LD-ld} -m elf_x86_64"
|
||||
;;
|
||||
ppc*-*linux*|powerpc*-*linux*)
|
||||
LD="${LD-ld} -m elf64ppc"
|
||||
;;
|
||||
s390*-*linux*)
|
||||
LD="${LD-ld} -m elf64_s390"
|
||||
;;
|
||||
sparc*-*linux*)
|
||||
LD="${LD-ld} -m elf64_sparc"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
rm -rf conftest*
|
||||
;;
|
||||
|
||||
*-*-sco3.2v5*)
|
||||
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
|
||||
SAVE_CFLAGS="$CFLAGS"
|
||||
@ -237,6 +281,65 @@ ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
|
||||
esac
|
||||
])
|
||||
|
||||
|
||||
# AC_LIBTOOL_SYS_MAX_CMD_LEN
|
||||
# --------------------------
|
||||
AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
|
||||
[# find the maximum length of command line arguments
|
||||
AC_MSG_CHECKING([the maximum length of command line arguments])
|
||||
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
|
||||
i=0
|
||||
teststring="ABCD"
|
||||
|
||||
case $build_os in
|
||||
msdosdjgpp*)
|
||||
# On DJGPP, this test can blow up pretty badly due to problems in libc
|
||||
# (any single argument exceeding 2000 bytes causes a buffer overrun
|
||||
# during glob expansion). Even if it were fixed, the result of this
|
||||
# check would be larger than it should be.
|
||||
lt_cv_sys_max_cmd_len=12288; # 12K is about right
|
||||
;;
|
||||
|
||||
cygwin* | mingw*)
|
||||
# On Win9x/ME, this test blows up -- it succeeds, but takes
|
||||
# about 5 minutes as the teststring grows exponentially.
|
||||
# Worse, since 9x/ME are not pre-emptively multitasking,
|
||||
# you end up with a "frozen" computer, even though with patience
|
||||
# the test eventually succeeds (with a max line length of 256k).
|
||||
# Instead, let's just punt: use the minimum linelength reported by
|
||||
# all of the supported platforms: 8192 (on NT/2K/XP).
|
||||
lt_cv_sys_max_cmd_len=8192;
|
||||
;;
|
||||
|
||||
amigaos*)
|
||||
# On AmigaOS with pdksh, this test takes hours, literally.
|
||||
# So we just punt and use a minimum line length of 8192.
|
||||
lt_cv_sys_max_cmd_len=8192;
|
||||
;;
|
||||
|
||||
netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
|
||||
# This has been around since 386BSD, at least. Likely further.
|
||||
if test -x /sbin/sysctl; then
|
||||
lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
|
||||
elif test -x /usr/sbin/sysctl; then
|
||||
lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
|
||||
else
|
||||
lt_cv_sys_max_cmd_len=65536 # usable default for *BSD
|
||||
fi
|
||||
# And add a safety zone
|
||||
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
|
||||
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
|
||||
;;
|
||||
esac
|
||||
])
|
||||
if test -n "$lt_cv_sys_max_cmd_len" ; then
|
||||
AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
|
||||
else
|
||||
AC_MSG_RESULT(none)
|
||||
fi
|
||||
])# AC_LIBTOOL_SYS_MAX_CMD_LEN
|
||||
|
||||
|
||||
# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
|
||||
AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
|
||||
|
||||
@ -565,6 +668,7 @@ cygwin* | mingw* |pw32*)
|
||||
;;
|
||||
|
||||
darwin* | rhapsody*)
|
||||
# this will be overwritten by pass_all, but leave it in just in case
|
||||
lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
|
||||
lt_cv_file_magic_cmd='/usr/bin/file -L'
|
||||
case "$host_os" in
|
||||
@ -575,6 +679,7 @@ darwin* | rhapsody*)
|
||||
lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
|
||||
;;
|
||||
esac
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
|
||||
freebsd* | kfreebsd*-gnu)
|
||||
@ -635,14 +740,7 @@ irix5* | irix6*)
|
||||
|
||||
# This must be Linux ELF.
|
||||
linux-gnu*)
|
||||
case $host_cpu in
|
||||
alpha* | mips* | hppa* | i*86 | powerpc* | sparc* | ia64* )
|
||||
lt_cv_deplibs_check_method=pass_all ;;
|
||||
*)
|
||||
# glibc up to 2.1.1 does not perform some relocations on ARM
|
||||
lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;;
|
||||
esac
|
||||
lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
|
||||
netbsd* | knetbsd*-gnu)
|
||||
@ -738,8 +836,9 @@ AC_DEFUN([AC_CHECK_LIBM],
|
||||
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||
LIBM=
|
||||
case $host in
|
||||
*-*-beos* | *-*-cygwin* | *-*-pw32*)
|
||||
*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
|
||||
# These system don't have libm
|
||||
# on darwin the libm is a symbolic link to libSystem.dylib
|
||||
;;
|
||||
*-ncr-sysv4.3*)
|
||||
AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
|
||||
|
||||
Loading…
Reference in New Issue
Block a user