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