diff options
| author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-07-23 12:51:36 +0000 |
|---|---|---|
| committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-07-23 12:51:36 +0000 |
| commit | 94d11afb008980a6dd1ecaace046320c2d889ad5 (patch) | |
| tree | 77f1be8d85ae17076524aa60d0cc502fb9c32ef7 /libjava | |
| parent | d61e7fe912734c891cde7b39f34f91b301a73d10 (diff) | |
| download | ppe42-gcc-94d11afb008980a6dd1ecaace046320c2d889ad5.tar.gz ppe42-gcc-94d11afb008980a6dd1ecaace046320c2d889ad5.zip | |
* configure.ac (mips-sgi-irix6*): Override SYSTEMSPEC.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@126847 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, 25 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 04a38a724e8..eaf3b5778c8 100644 --- 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 370534beada..861c522d89b 100755 --- 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 9a9d1fde179..ddda4e8911a 100644 --- 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 |
