Patchwork [libjava,build] Don't link libgcj with libdl on IRIX

login
register
mail settings
Submitter Rainer Orth
Date Feb. 2, 2011, 1:57 p.m.
Message ID <yddvd12r13m.fsf@manam.CeBiTec.Uni-Bielefeld.DE>
Download mbox | patch
Permalink /patch/81452/
State New
Headers show

Comments

Rainer Orth - Feb. 2, 2011, 1:57 p.m.
Along the same lines as

	[boehm-gc, build] Don't link libgcjgc with libdl on IRIX
        http://gcc.gnu.org/ml/gcc-patches/2011-02/msg00111.html

it isn't necessary to jump through hoops to avoid missing the 64-bit
libdl which no special library is necessary at all, thus the following
patch.

Bootstrapped without regressions on mips-sgi-irix6.5, installed.

	Rainer


2011-01-28  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	* configure.ac: Don't use libdl on mips-sgi-irix6*.
	* configure: Regenerate.

Patch

diff -r 93b23f40f874 libjava/configure.ac
--- a/libjava/configure.ac	Fri Jan 28 13:05:59 2011 +0100
+++ b/libjava/configure.ac	Fri Jan 28 13:08:24 2011 +0100
@@ -1460,15 +1460,14 @@ 
    if test "$GC" = boehm; then
       case "${host}" in
           mips-sgi-irix6*)
-	    # IRIX 6 lacks a N64 libdl.so, but only the N32 (default multilib)
-	    # libgcj.spec is used, so override here
-	    SYSTEMSPEC="$SYSTEMSPEC %{!mabi=64:-ldl}"
-	  ;;
+	    # While IRIX 6 has libdl for the O32 and N32 ABIs, the N64 one is
+	    # missing.  It's unnecessary anyway since dlopen lives in libc.
+	    ;;
 	  *-*-darwin*)
-	  ;;
+	    ;;
 	  *)
             AC_CHECK_LIB(dl, main, SYSTEMSPEC="$SYSTEMSPEC -ldl")
-	  ;;
+	    ;;
       esac
    fi
 fi