2010-09-21 Jack Howarth <howarth@bromo.med.uc.edu>

	* libjava/configure.ac: Set LIBMATHSPEC to -lm except on darwin.
	* libjava/libgcj.spec.in: Use LIBMATHSPEC.
	* libjava/configure: Regenerate.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@164478 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 33 insertions, 4 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7094149fb2c..11f14b15b34 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-21  Jack Howarth <howarth@bromo.med.uc.edu>
+
+	* libjava/configure.ac: Set LIBMATHSPEC to -lm except on darwin.
+	* libjava/libgcj.spec.in: Use LIBMATHSPEC.
+	* libjava/configure: Regenerate.
+
 2010-08-27  Dmitrijs Ledkovs  <dmitrij.ledkov@ubuntu.com>
 	    Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
diff --git a/libjava/configure b/libjava/configure
index 8fa4baffd68..80a59d6eeff 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -707,6 +707,7 @@ GCDEPS
 GCINCS
 GCLIBS
 LIBGCJTESTSPEC
+LIBMATHSPEC
 LIBSTDCXXSPEC
 extra_ldflags
 extra_ldflags_libjava
@@ -13353,7 +13354,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 13356 "configure"
+#line 13357 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13459,7 +13460,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 13462 "configure"
+#line 13463 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -19438,7 +19439,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then :
   enableval=$enable_sjlj_exceptions; :
 else
   cat > conftest.$ac_ext << EOF
-#line 19441 "configure"
+#line 19442 "configure"
 struct S { ~S(); };
 void bar();
 void foo()
@@ -20535,6 +20536,16 @@ arm*linux*eabi)
     ;;
 esac
 
+LIBMATHSPEC=
+# extra LD Flags which are required for targets
+case "${host}" in
+*-*-darwin*)
+     ;;
+*)
+     LIBMATHSPEC=-lm
+     ;;
+esac
+
 # Check for --no-merge-exidx-entries, an ARM-specific linker option.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --no-merge-exidx-entries" >&5
 $as_echo_n "checking for --no-merge-exidx-entries... " >&6; }
@@ -20582,6 +20593,7 @@ fi
 
 
 
+
 # Allow the GC to be disabled.  Can be useful when debugging.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for garbage collector to use" >&5
 $as_echo_n "checking for garbage collector to use... " >&6; }
diff --git a/libjava/configure.ac b/libjava/configure.ac
index df6bca3f662..c64f6f3c3dd 100644
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -931,6 +931,16 @@ arm*linux*eabi)
     ;;
 esac
 
+LIBMATHSPEC=
+# extra LD Flags which are required for targets
+case "${host}" in
+*-*-darwin*)
+     ;;
+*)
+     LIBMATHSPEC=-lm
+     ;;
+esac
+
 # Check for --no-merge-exidx-entries, an ARM-specific linker option.
 AC_CACHE_CHECK([for --no-merge-exidx-entries], [libgcj_cv_exidx],
   [saved_ldflags="$LDFLAGS"
@@ -956,6 +966,7 @@ fi
 AC_SUBST(extra_ldflags_libjava)
 AC_SUBST(extra_ldflags)
 AC_SUBST(LIBSTDCXXSPEC)
+AC_SUBST(LIBMATHSPEC)
 
 AC_SUBST(LIBGCJTESTSPEC)
 
diff --git a/libjava/libgcj.spec.in b/libjava/libgcj.spec.in
index 55eb0c2e658..8d39532a4b8 100644
--- a/libjava/libgcj.spec.in
+++ b/libjava/libgcj.spec.in
@@ -7,6 +7,6 @@
 *startfile: @THREADSTARTFILESPEC@ %(startfileorig)
 
 %rename lib liborig
-*lib: @LD_START_STATIC_SPEC@ @LIBGCJ_SPEC@ @LD_FINISH_STATIC_SPEC@ -lm @LIBICONV@ @GCSPEC@ @THREADSPEC@ @ZLIBSPEC@ @SYSTEMSPEC@ %(libgcc) @LIBSTDCXXSPEC@ %(liborig)
+*lib: @LD_START_STATIC_SPEC@ @LIBGCJ_SPEC@ @LD_FINISH_STATIC_SPEC@ @LIBMATHSPEC@ @LIBICONV@ @GCSPEC@ @THREADSPEC@ @ZLIBSPEC@ @SYSTEMSPEC@ %(libgcc) @LIBSTDCXXSPEC@ %(liborig)
 
 *jc1: @HASH_SYNC_SPEC@ @DIVIDESPEC@ @CHECKREFSPEC@ @JC1GCSPEC@ @EXCEPTIONSPEC@ @BACKTRACESPEC@ @IEEESPEC@ @ATOMICSPEC@ @LIBGCJ_BC_SPEC@ -fkeep-inline-functions