summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorivmai <ivmai>2011-04-13 21:49:10 +0200
committerIvan Maidanski <ivmai@mail.ru>2011-07-26 19:06:57 +0200
commit4f1aba885b401294b5d0690f953949f825d43101 (patch)
tree18f914a6b0ff6e8c62ae3b6a253b1c923f9d5ddb /configure.ac
parent109f09d2849db75ea51452dff1169f4418ac74b5 (diff)
2011-04-13 Ivan Maidanski <ivmai@mail.ru> (mostly really Rainer Orth)
* configure.ac (THREADDLLIBS): Use alternate thread library on Solaris 8. * configure.ac (need_atomic_ops_asm): Set to true only for Sparc Solaris. * configure.ac: Don't use libdl on mips-sgi-irix6. * configure: Regenerate.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac27
1 files changed, 19 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index e4c62e7..0d9083e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,8 +22,8 @@ AC_INIT(gc,7.2alpha5,Hans.Boehm@hp.com)
AC_CONFIG_SRCDIR(gcj_mlc.c)
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_TARGET
-AC_PREREQ(2.53)
-AC_REVISION($Revision: 1.64 $)
+AC_PREREQ(2.64)
+AC_REVISION($Revision: 1.65 $)
GC_SET_VERSION
AM_INIT_AUTOMAKE([foreign dist-bzip2 nostdinc])
AM_CONFIG_HEADER([include/private/config.h])
@@ -180,11 +180,11 @@ case "$THREADS" in
*-*-solaris*)
AC_DEFINE(GC_SOLARIS_THREADS)
AC_DEFINE(THREAD_LOCAL_ALLOC)
- THREADDLLIBS="-lpthread -lrt"
- if test "$GCC" != yes; then
- CFLAGS="$CFLAGS -O"
- need_atomic_ops_asm=true
- fi
+ # Need to use alternate thread library, otherwise gctest hangs
+ # on Solaris 8.
+ multi_os_directory=`$CC -print-multi-os-directory`
+ THREADDLLIBS="-L/usr/lib/lwp/$multi_os_directory \
+ -R/usr/lib/lwp/$multi_os_directory -lpthread -lrt"
;;
*-*-irix*)
AC_DEFINE(GC_IRIX_THREADS)
@@ -226,6 +226,14 @@ case "$THREADS" in
AC_MSG_ERROR("Pthreads not supported by the GC on this platform.")
;;
esac
+ case "$host" in
+ sparc*-*-solaris*)
+ if test "$GCC" != yes; then
+ CFLAGS="$CFLAGS -O"
+ need_atomic_ops_asm=true
+ fi
+ ;;
+ esac
;;
win32)
AC_DEFINE(GC_THREADS)
@@ -293,9 +301,12 @@ if test $compiler_xlc = yes -a "$powerpc_darwin" = true; then
AC_DEFINE([DARWIN_DONT_PARSE_STACK], 1, [See doc/README.macros.])
fi
+case "$host" in
+# While IRIX 6 has libdl for the O32 and N32 ABIs, it's missing for N64
+# and unnecessary everywhere.
+ mips-sgi-irix6*) ;;
# We never want libdl on darwin. It is a fake libdl that just ends up making
# dyld calls anyway. The same applies to Cygwin.
-case "$host" in
*-*-darwin*) ;;
*-*-cygwin*) ;;
*)