Commit d80148b8 by Jack Howarth Committed by Iain Sandoe

configure.ac: Set LIBMATHSPEC to -lm except on darwin.


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.

From-SVN: r164478
parent c9cdcaa5
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> 2010-08-27 Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>
Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
......
...@@ -707,6 +707,7 @@ GCDEPS ...@@ -707,6 +707,7 @@ GCDEPS
GCINCS GCINCS
GCLIBS GCLIBS
LIBGCJTESTSPEC LIBGCJTESTSPEC
LIBMATHSPEC
LIBSTDCXXSPEC LIBSTDCXXSPEC
extra_ldflags extra_ldflags
extra_ldflags_libjava extra_ldflags_libjava
...@@ -13353,7 +13354,7 @@ else ...@@ -13353,7 +13354,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 13356 "configure" #line 13357 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
...@@ -13459,7 +13460,7 @@ else ...@@ -13459,7 +13460,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 13462 "configure" #line 13463 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
...@@ -19438,7 +19439,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : ...@@ -19438,7 +19439,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then :
enableval=$enable_sjlj_exceptions; : enableval=$enable_sjlj_exceptions; :
else else
cat > conftest.$ac_ext << EOF cat > conftest.$ac_ext << EOF
#line 19441 "configure" #line 19442 "configure"
struct S { ~S(); }; struct S { ~S(); };
void bar(); void bar();
void foo() void foo()
...@@ -20535,6 +20536,16 @@ arm*linux*eabi) ...@@ -20535,6 +20536,16 @@ arm*linux*eabi)
;; ;;
esac 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. # 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 "$as_me:${as_lineno-$LINENO}: checking for --no-merge-exidx-entries" >&5
$as_echo_n "checking for --no-merge-exidx-entries... " >&6; } $as_echo_n "checking for --no-merge-exidx-entries... " >&6; }
...@@ -20582,6 +20593,7 @@ fi ...@@ -20582,6 +20593,7 @@ fi
# Allow the GC to be disabled. Can be useful when debugging. # 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 "$as_me:${as_lineno-$LINENO}: checking for garbage collector to use" >&5
$as_echo_n "checking for garbage collector to use... " >&6; } $as_echo_n "checking for garbage collector to use... " >&6; }
......
...@@ -931,6 +931,16 @@ arm*linux*eabi) ...@@ -931,6 +931,16 @@ arm*linux*eabi)
;; ;;
esac 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. # Check for --no-merge-exidx-entries, an ARM-specific linker option.
AC_CACHE_CHECK([for --no-merge-exidx-entries], [libgcj_cv_exidx], AC_CACHE_CHECK([for --no-merge-exidx-entries], [libgcj_cv_exidx],
[saved_ldflags="$LDFLAGS" [saved_ldflags="$LDFLAGS"
...@@ -956,6 +966,7 @@ fi ...@@ -956,6 +966,7 @@ fi
AC_SUBST(extra_ldflags_libjava) AC_SUBST(extra_ldflags_libjava)
AC_SUBST(extra_ldflags) AC_SUBST(extra_ldflags)
AC_SUBST(LIBSTDCXXSPEC) AC_SUBST(LIBSTDCXXSPEC)
AC_SUBST(LIBMATHSPEC)
AC_SUBST(LIBGCJTESTSPEC) AC_SUBST(LIBGCJTESTSPEC)
......
...@@ -7,6 +7,6 @@ ...@@ -7,6 +7,6 @@
*startfile: @THREADSTARTFILESPEC@ %(startfileorig) *startfile: @THREADSTARTFILESPEC@ %(startfileorig)
%rename lib liborig %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 *jc1: @HASH_SYNC_SPEC@ @DIVIDESPEC@ @CHECKREFSPEC@ @JC1GCSPEC@ @EXCEPTIONSPEC@ @BACKTRACESPEC@ @IEEESPEC@ @ATOMICSPEC@ @LIBGCJ_BC_SPEC@ -fkeep-inline-functions
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment