configure.ac (THREADLIBS): Don't set on Darwin.

2010-08-18  Jack Howarth <howarth@bromo.med.uc.edu>

	    * libjava/configure.ac (THREADLIBS): Don't set on Darwin.
	    (THREADSPEC): Likwise.
	    * libjava/configure: Regenerate.
	    * libjava/Makefile.am: Define LIBJAVA_LDFLAGS_LIBMATH as
	    -lm only if USING_DARWIN_CRT undefined.
	    (libgcj_tools_la_LIBADD): Replace '-lm' with $(LIBJAVA_LDFLAGS_LIBMATH).
	    * libjava/Makefile.in: Regenerate.

From-SVN: r163329

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c986c4d2ff65787e0d5a4c0cca4eccfcd2bc0a5d..986bd78cde1e95649d6ea8756ced49b706dc8b76 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-18  Jack Howarth <howarth@bromo.med.uc.edu>
+
+       * libjava/configure.ac (THREADLIBS): Don't set on Darwin.
+       (THREADSPEC): Likwise.
+       * libjava/configure: Regenerate.
+       * libjava/Makefile.am: Define LIBJAVA_LDFLAGS_LIBMATH as
+       -lm only if USING_DARWIN_CRT undefined.
+       (libgcj_tools_la_LIBADD): Replace '-lm' with $(LIBJAVA_LDFLAGS_LIBMATH).
+       * libjava/Makefile.in: Regenerate.
+
 2010-08-17  Iain Sandoe  <iains@gcc.gnu.org>
 
        * include/posix.h: Make substitution of 

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 7b67ed0e1e78ee1be61516c80fdb11c91e4b9065..dcdf82730071ba2b7ef48013416d4082438ff74b 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -465,6 +465,9 @@ endif
 
 if USING_DARWIN_CRT
 libgcj_la_SOURCES += darwin.cc
+LIBJAVA_LDFLAGS_LIBMATH =
+else
+LIBJAVA_LDFLAGS_LIBMATH = -lm
 endif
 
 if USING_POSIX_THREADS
@@ -544,7 +547,9 @@ libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch \
  -fsource-filename=$(here)/classpath/tools/all-classes.lst
 libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
  -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
- $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBJAVA_LDFLAGS_NOUNDEF) -lm
+ $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBJAVA_LDFLAGS_NOUNDEF) \
+ $(LIBJAVA_LDFLAGS_LIBMATH)
+
 libgcj_tools_la_LIBADD = libgcj.la
 libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec \
  $(libgcj_tools_la_version_dep)

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 9daa03e9486a77cf8347800d3c89c7ad9e3e4067..591624c66e389e65c7646f496e3797eaf1f9c07e 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -1051,6 +1051,8 @@ libgcj_la_SOURCES = prims.cc jni.cc exception.cc stacktrace.cc link.cc \
        $(nat_source_files) $(am__append_11) $(am__append_12) \
        $(am__append_13) $(am__append_14) $(am__append_15) \
        $(am__append_16) $(am__append_17) $(am__append_18)
+@USING_DARWIN_CRT_FALSE@LIBJAVA_LDFLAGS_LIBMATH = -lm
+@USING_DARWIN_CRT_TRUE@LIBJAVA_LDFLAGS_LIBMATH = 
 nat_files = $(nat_source_files:.cc=.lo)
 xlib_nat_files = $(xlib_nat_source_files:.cc=.lo)
 
@@ -1101,7 +1103,8 @@ libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch \
 
 libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
  -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
- $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBJAVA_LDFLAGS_NOUNDEF) -lm
+ $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBJAVA_LDFLAGS_NOUNDEF) \
+ $(LIBJAVA_LDFLAGS_LIBMATH)
 
 libgcj_tools_la_LIBADD = libgcj.la
 libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec \

diff --git a/libjava/configure b/libjava/configure
index 8ccfa24cc126c92f0eb1ace3c80edca993d761bc..955332bb2d07bedd30a708210ece1addb0286391 100755 (executable)
--- a/libjava/configure
+++ b/libjava/configure
@@ -20725,6 +20725,10 @@ case "$THREADS" in
        THREADLIBS='-lpthread -lthread'
        THREADSPEC='-lpthread -lthread'
        ;;
+     *-*-darwin*)
+       # Don't set THREADLIBS or THREADSPEC as Darwin already
+       # provides pthread via libSystem.
+       ;;
      *)
        THREADLIBS=-lpthread
        THREADSPEC=-lpthread
@@ -23102,6 +23106,8 @@ fi
            # libgcj.spec is used, so override here
            SYSTEMSPEC="$SYSTEMSPEC %{!mabi=64:-ldl}"
          ;;
+         *-*-darwin*)
+         ;;
          *)
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ldl" >&5
 $as_echo_n "checking for main in -ldl... " >&6; }

diff --git a/libjava/configure.ac b/libjava/configure.ac
index 125e9ce9b46ca8acc8f821fdb6e80b0a09184e83..685cb725575b4dd5a57c57a179b14ad1d486224c 100644 (file)
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -1077,6 +1077,10 @@ case "$THREADS" in
        THREADLIBS='-lpthread -lthread'
        THREADSPEC='-lpthread -lthread'
        ;;
+     *-*-darwin*)
+       # Don't set THREADLIBS or THREADSPEC as Darwin already
+       # provides pthread via libSystem.
+       ;;
      *)
        THREADLIBS=-lpthread
        THREADSPEC=-lpthread
@@ -1445,6 +1449,8 @@ else
            # libgcj.spec is used, so override here
            SYSTEMSPEC="$SYSTEMSPEC %{!mabi=64:-ldl}"
          ;;
+         *-*-darwin*)
+         ;;
          *)
             AC_CHECK_LIB(dl, main, SYSTEMSPEC="$SYSTEMSPEC -ldl")
          ;;