diff options
| author | andreas_kupries <akupries@shaw.ca> | 2008-04-01 20:11:51 (GMT) |
|---|---|---|
| committer | andreas_kupries <akupries@shaw.ca> | 2008-04-01 20:11:51 (GMT) |
| commit | bed7b13fd799aa21ec8050caed5b225fdcad7679 (patch) | |
| tree | b1260f9a971cc8a091695057472dc1488f2be0fe /unix/tcl.m4 | |
| parent | 353bf57ae4b468d9b9893f9fbf85b5994d100f0d (diff) | |
| download | tcl-bed7b13fd799aa21ec8050caed5b225fdcad7679.zip tcl-bed7b13fd799aa21ec8050caed5b225fdcad7679.tar.gz tcl-bed7b13fd799aa21ec8050caed5b225fdcad7679.tar.bz2 | |
* generic/tclStrToD.c: Applied patch for [Bug 1839067] (fp
* unix/tcl.m4: rounding setup on solaris x86, native cc), provided
* unix/configure: by Michael Schlenker. configure regen'd.
Diffstat (limited to 'unix/tcl.m4')
| -rw-r--r-- | unix/tcl.m4 | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 0b69ba0..2ac40da 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1930,6 +1930,24 @@ dnl AC_CHECK_TOOL(AR, ar) ]) ], [AC_MSG_WARN([64bit mode not supported for $arch])])]) ]) + + #-------------------------------------------------------------------- + # On Solaris 5.x i386 with the sunpro compiler we need to link + # with sunmath to get floating point rounding control + #-------------------------------------------------------------------- + AS_IF([test "$GCC" = yes],[use_sunmath=no],[ + arch=`isainfo` + AC_MSG_CHECKING([whether to use -lsunmath for fp rounding control]) + AS_IF([test "$arch" = "amd64 i386"], [ + AC_MSG_RESULT([yes]) + MATH_LIBS="-lsunmath $MATH_LIBS" + AC_CHECK_HEADER(sunmath.h) + use_sunmath=yes + ], [ + AC_MSG_RESULT([no]) + use_sunmath=no + ]) + ]) # Note: need the LIBS below, otherwise Tk won't find Tcl's # symbols when dynamically loaded into tclsh. @@ -1938,6 +1956,8 @@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" + + AS_IF([test "$GCC" = yes], [ SHLIB_LD='${CC} -shared' CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' @@ -1952,11 +1972,12 @@ dnl AC_CHECK_TOOL(AR, ar) #CC_SEARCH_FLAGS="${CC_SEARCH_FLAGS},-R,$v9gcclibdir" ]) ], [ + AS_IF([test "$use_sunmath" = yes], [textmode=textoff],[textmode=text]) case $system in SunOS-5.[[1-9]][[0-9]]*) - SHLIB_LD='${CC} -G -z text ${LDFLAGS}';; + SHLIB_LD="${CC} -G -z $textmode \${LDFLAGS}";; *) - SHLIB_LD='/usr/ccs/bin/ld -G -z text';; + SHLIB_LD="/usr/ccs/bin/ld -G -z $textmode";; esac CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' @@ -2596,7 +2617,7 @@ AC_DEFUN([SC_TCL_LINK_LIBS], [ AC_CHECK_FUNC(sin, MATH_LIBS="", MATH_LIBS="-lm") AC_CHECK_LIB(ieee, main, [MATH_LIBS="-lieee $MATH_LIBS"]) - + #-------------------------------------------------------------------- # Interactive UNIX requires -linet instead of -lsocket, plus it # needs net/errno.h to define the socket-related error codes. |