This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project GNU Libtool.
The branch, master has been updated
via 9196966580f6853a31187a7a3c7e7ff36ef08982 (commit)
from 286e87b1030c353d9cfc89dbb72d59e0391cb693 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 9196966580f6853a31187a7a3c7e7ff36ef08982
Author: Rainer Orth r...@cebitec.uni-bielefeld.de
Date: Tue Feb 1 07:34:26 2011 +0100
Fix LD setting for 64-bit Solaris 2/x86.
* libltdl/m4/libtool.m4 (_LT_ENABLE_LOCK) [*-*-solaris*):
Determine GNU ld options for 64-bit Solaris 2/x86. Detect gld
2.21 _sol2 emulations.
Signed-off-by: Ralf Wildenhues ralf.wildenh...@gmx.de
---
Summary of changes:
ChangeLog |7 +++
libltdl/m4/libtool.m4 | 17 +++--
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8ff779b..ef4c27c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-02-01 Rainer Orth r...@cebitec.uni-bielefeld.de (tiny change)
+
+ Fix LD setting for 64-bit Solaris 2/x86.
+ * libltdl/m4/libtool.m4 (_LT_ENABLE_LOCK) [*-*-solaris*):
+ Determine GNU ld options for 64-bit Solaris 2/x86. Detect gld
+ 2.21 _sol2 emulations.
+
2011-01-27 Peter O'Gorman pe...@pogma.com
Don't loop through wrapper script arguments unnecessarily.
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 033c9a0..5cc027b 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -1374,14 +1374,27 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
CFLAGS=$SAVE_CFLAGS
fi
;;
-sparc*-*solaris*)
+*-*solaris*)
# 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
*64-bit*)
case $lt_cv_prog_gnu_ld in
- yes*) LD=${LD-ld} -m elf64_sparc ;;
+ yes*)
+case $host in
+i?86-*-solaris*)
+ LD=${LD-ld} -m elf_x86_64
+ ;;
+sparc*-*-solaris*)
+ LD=${LD-ld} -m elf64_sparc
+ ;;
+esac
+# GNU ld 2.21 introduced _sol2 emulations. Use them if available.
+if ${LD-ld} -V | grep _sol2 /dev/null 21; then
+ LD=${LD-ld}_sol2
+fi
+;;
*)
if ${LD-ld} -64 -r -o conftest2.o conftest.o /dev/null 21; then
LD=${LD-ld} -64
hooks/post-receive
--
GNU Libtool
