diff options
| author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-02-02 13:58:30 +0000 |
|---|---|---|
| committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-02-02 13:58:30 +0000 |
| commit | bd785057b42734e859f64428467a673ee3c00372 (patch) | |
| tree | 0d6cbcd32b56ca2ad1946f163bc66755485ee462 /libjava | |
| parent | a9cc177ef514d6eb39db72c82911fcea2cd70dba (diff) | |
| download | gcc-bd785057b42734e859f64428467a673ee3c00372.tar.gz | |
* configure.ac: Don't use libdl on mips-sgi-irix6*.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@169522 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rwxr-xr-x | libjava/configure | 11 | ||||
| -rw-r--r-- | libjava/configure.ac | 11 |
3 files changed, 15 insertions, 12 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index aa1c306ef8d..0b6ba9681cf 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -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> * testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation): diff --git a/libjava/configure b/libjava/configure index 8ffc640c1c4..2fd20a4964e 100755 --- a/libjava/configure +++ b/libjava/configure @@ -23141,12 +23141,11 @@ fi 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*) - ;; + ;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ldl" >&5 $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" fi - ;; + ;; esac fi fi diff --git a/libjava/configure.ac b/libjava/configure.ac index 52e5d78e8cf..e5310c1c955 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -1460,15 +1460,14 @@ else 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 |