configure.ac (mips-sgi-irix6*): Override SYSTEMSPEC.

	* configure.ac (mips-sgi-irix6*): Override SYSTEMSPEC.
	* configure: Regenerate.

From-SVN: r126847

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 04a38a724e8870a14351263f07b97f2860857d12..eaf3b5778c8fae74a86d2914bd80be202f862c1d 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-23  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+       * configure.ac (mips-sgi-irix6*): Override SYSTEMSPEC.
+       * configure: Regenerate.
+
 2007-07-16  Rask Ingemann Lambertsen  <rask@sygehus.dk>
 
        PR target/32340

diff --git a/libjava/configure b/libjava/configure
index 370534beada850084938797389bc71a22a6d70c7..861c522d89b821a2a638dc72ac2cc2ba23238792 100755 (executable)
--- a/libjava/configure
+++ b/libjava/configure
@@ -25149,7 +25149,14 @@ fi
    # On Solaris, and maybe other architectures, the Boehm collector
    # requires -ldl.
    if test "$GC" = boehm; then
-      echo "$as_me:$LINENO: checking for main in -ldl" >&5
+      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}"
+         ;;
+         *)
+            echo "$as_me:$LINENO: checking for main in -ldl" >&5
 echo $ECHO_N "checking for main in -ldl... $ECHO_C" >&6
 if test "${ac_cv_lib_dl_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -25216,6 +25223,8 @@ if test $ac_cv_lib_dl_main = yes; then
   SYSTEMSPEC="$SYSTEMSPEC -ldl"
 fi
 
+         ;;
+      esac
    fi
 fi
 

diff --git a/libjava/configure.ac b/libjava/configure.ac
index 9a9d1fde1798b55a904f0f2ac11784649992f9a7..ddda4e8911a74f238cb602862b1f55e5aa1c59f1 100644 (file)
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -1247,7 +1247,16 @@ else
    # On Solaris, and maybe other architectures, the Boehm collector
    # requires -ldl.
    if test "$GC" = boehm; then
-      AC_CHECK_LIB(dl, main, SYSTEMSPEC="$SYSTEMSPEC -ldl")
+      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}"
+         ;;
+         *)
+            AC_CHECK_LIB(dl, main, SYSTEMSPEC="$SYSTEMSPEC -ldl")
+         ;;
+      esac
    fi
 fi