OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

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

From-SVN: r169522
This commit is contained in:
Rainer Orth 2011-02-02 13:58:30 +00:00 committed by Rainer Orth
parent 11fdd877a5
commit 3aa831ba82
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
2011-02-02 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* configure.ac: Don't use libdl on mips-sgi-irix6*.
* configure: Regenerate.
2011-01-06 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> 2011-01-06 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation): * testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation):

11
libjava/configure vendored
View File

@ -23141,12 +23141,11 @@ fi
if test "$GC" = boehm; then if test "$GC" = boehm; then
case "${host}" in case "${host}" in
mips-sgi-irix6*) mips-sgi-irix6*)
# IRIX 6 lacks a N64 libdl.so, but only the N32 (default multilib) # While IRIX 6 has libdl for the O32 and N32 ABIs, the N64 one is
# libgcj.spec is used, so override here # missing. It's unnecessary anyway since dlopen lives in libc.
SYSTEMSPEC="$SYSTEMSPEC %{!mabi=64:-ldl}" ;;
;;
*-*-darwin*) *-*-darwin*)
;; ;;
*) *)
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ldl" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ldl" >&5
$as_echo_n "checking for main in -ldl... " >&6; } $as_echo_n "checking for main in -ldl... " >&6; }
@ -23185,7 +23184,7 @@ if test "x$ac_cv_lib_dl_main" = x""yes; then :
SYSTEMSPEC="$SYSTEMSPEC -ldl" SYSTEMSPEC="$SYSTEMSPEC -ldl"
fi fi
;; ;;
esac esac
fi fi
fi fi

11
libjava/configure.ac
View File

@ -1460,15 +1460,14 @@ else
if test "$GC" = boehm; then if test "$GC" = boehm; then
case "${host}" in case "${host}" in
mips-sgi-irix6*) mips-sgi-irix6*)
# IRIX 6 lacks a N64 libdl.so, but only the N32 (default multilib) # While IRIX 6 has libdl for the O32 and N32 ABIs, the N64 one is
# libgcj.spec is used, so override here # missing. It's unnecessary anyway since dlopen lives in libc.
SYSTEMSPEC="$SYSTEMSPEC %{!mabi=64:-ldl}" ;;
;;
*-*-darwin*) *-*-darwin*)
;; ;;
*) *)
AC_CHECK_LIB(dl, main, SYSTEMSPEC="$SYSTEMSPEC -ldl") AC_CHECK_LIB(dl, main, SYSTEMSPEC="$SYSTEMSPEC -ldl")
;; ;;
esac esac
fi fi
fi fi