diff options
| author | iains <iains@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-08-18 08:51:57 +0000 |
|---|---|---|
| committer | iains <iains@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-08-18 08:51:57 +0000 |
| commit | d947fb63a6626f195d815d4360937718dedb6ac6 (patch) | |
| tree | 141951189d8c9f34c6def3888b707ca9f741dfdb /libjava | |
| parent | 06df6b178d3f0777243244b847004e5c1292e3f0 (diff) | |
| download | gcc-d947fb63a6626f195d815d4360937718dedb6ac6.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@163329 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 10 | ||||
| -rw-r--r-- | libjava/Makefile.am | 7 | ||||
| -rw-r--r-- | libjava/Makefile.in | 5 | ||||
| -rwxr-xr-x | libjava/configure | 6 | ||||
| -rw-r--r-- | libjava/configure.ac | 6 |
5 files changed, 32 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c986c4d2ff6..986bd78cde1 100644 --- 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 7b67ed0e1e7..dcdf8273007 100644 --- 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 9daa03e9486..591624c66e3 100644 --- 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 8ccfa24cc12..955332bb2d0 100755 --- 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 125e9ce9b46..685cb725575 100644 --- 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") ;; |