This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: Fix libjava x86-64 multilib
- From: Andreas Jaeger <aj at suse dot de>
- To: Jakub Jelinek <jakub at redhat dot com>
- Cc: Alexandre Oliva <aoliva at redhat dot com>,Bo Thorsen <bo at sonofthor dot dk>, gcc-patches at gcc dot gnu dot org
- Date: Tue, 19 Nov 2002 16:37:42 +0100
- Subject: Re: Fix libjava x86-64 multilib
- References: <200210012044.41032.bo@sonofthor.dk><orfzvpycop.fsf@free.redhat.lsd.ic.unicamp.br><20021002031810.U5659@devserv.devel.redhat.com>
The libtool maintainers have accepted the libtool patch, I'll add it
here again for reference.
What's the right way to add it? Shall I just add this hunk and commit
it - and then run autoconf on java/configure and commit the new
configure also? Or what needs to be done with incorporating this
change?
Andreas
2002-11-19 Andreas Jaeger <aj@suse.de>
* libtool.m4 (libtool_flags): Add patch from libtool CVS: Support
linking of 32-bit libraries with ld on the x86-64, ppc64, s390x
and sparc64 GNU/Linux systems.
============================================================
Index: libtool.m4
--- libtool.m4 14 Aug 2002 02:39:52 -0000 1.9
+++ libtool.m4 19 Nov 2002 15:33:59 -0000
@@ -175,6 +175,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*)
+ 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"
--
Andreas Jaeger
SuSE Labs aj@suse.de
private aj@arthur.inka.de
http://www.suse.de/~aj