diff options


context:
space:
mode:

author	hobbs <hobbs>	2003-11-12 01:07:44 (GMT)
committer	hobbs <hobbs>	2003-11-12 01:07:44 (GMT)
commit	700c11b1ef9a0e08c83686050dd88852dc04e83a (patch)
tree	b8a7ee4a6676dce5d385e8c1a21ad943b42b361f /unix
parent	2e682bb4a79b3b1988ba91cdda91e1f787ecf1d5 (diff)
download	tcl-700c11b1ef9a0e08c83686050dd88852dc04e83a.zip tcl-700c11b1ef9a0e08c83686050dd88852dc04e83a.tar.gz tcl-700c11b1ef9a0e08c83686050dd88852dc04e83a.tar.bz2

* unix/configure:

* unix/tcl.m4: improve AIX --enable-64bit handling remove -D__NO_STRING_INLINES -D__NO_MATH_INLINES from CFLAGS_OPTIMIZE on Linux. Make default opt -O2 (was -O).

Diffstat (limited to 'unix')

-rwxr-xr-x

unix/configure

-rw-r--r--

unix/tcl.m4

2 files changed, 79 insertions, 81 deletions

diff --git a/unix/configure b/unix/configure
index 5baf638..8009dfb 100755
--- a/unix/configure
+++ b/unix/configure

@@ -10835,7 +10835,7 @@ fi

ECHO_VERSION='`echo ${VERSION}`'

TCL_LIB_VERSIONS_OK=ok

CFLAGS_DEBUG=-g

- CFLAGS_OPTIMIZE=-O

+ CFLAGS_OPTIMIZE=-O2

if test "$GCC" = "yes" ; then

CFLAGS_WARNING="-Wall -Wconversion -Wno-implicit-int"

else

@@ -10900,30 +10900,10 @@ echo "${ECHO_T}Using $CC for compiling with threads" >&6

LIBS="$LIBS -lc"

# AIX-5 uses ELF style dynamic libraries

SHLIB_CFLAGS=""

- SHLIB_LD_LIBS='${LIBS}'

- SHLIB_SUFFIX=".so"

- if test "`uname -m`" = "ia64" ; then

- # AIX-5 uses ELF style dynamic libraries on IA-64, but not PPC

- SHLIB_LD="/usr/ccs/bin/ld -G -z text"

- # AIX-5 has dl* in libc.so

- DL_LIBS=""

- if test "$GCC" = "yes" ; then

- CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'

- else

- CC_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}'

- fi

- LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'

- else

- SHLIB_LD="${TCL_SRC_DIR}/unix/ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry"

- DL_LIBS="-ldl"

- CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'

- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}

- TCL_NEEDS_EXP_FILE=1

- TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.exp'

- fi

# Note: need the LIBS below, otherwise Tk won't find Tcl's

# symbols when dynamically loaded into tclsh.

+ SHLIB_LD_LIBS='${LIBS}'

+ SHLIB_SUFFIX=".so"

DL_OBJS="tclLoadDl.o"

LDFLAGS=""

@@ -10944,6 +10924,26 @@ echo "$as_me: WARNING: \"64bit mode not supported with GCC on $system\"" >&2;}

SHLIB_LD_FLAGS="-b64"

+ if test "`uname -m`" = "ia64" ; then

+ # AIX-5 uses ELF style dynamic libraries on IA-64, but not PPC

+ SHLIB_LD="/usr/ccs/bin/ld -G -z text"

+ # AIX-5 has dl* in libc.so

+ DL_LIBS=""

+ if test "$GCC" = "yes" ; then

+ CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'

+ else

+ CC_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}'

+ fi

+ LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'

+ else

+ SHLIB_LD="${TCL_SRC_DIR}/unix/ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry ${SHLIB_LD_FLAGS}"

+ DL_LIBS="-ldl"

+ CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'

+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}

+ TCL_NEEDS_EXP_FILE=1

+ TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.exp'

+ fi

;;

AIX-*)

if test "${TCL_THREADS}" = "1" -a "$GCC" != "yes" ; then

@@ -10956,7 +10956,6 @@ echo "${ECHO_T}Using $CC for compiling with threads" >&6

LIBS="$LIBS -lc"

SHLIB_CFLAGS=""

- SHLIB_LD="${TCL_SRC_DIR}/unix/ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry"

SHLIB_LD_LIBS='${LIBS}'

SHLIB_SUFFIX=".so"

DL_OBJS="tclLoadDl.o"

@@ -10974,6 +10973,22 @@ echo "${ECHO_T}Using $CC for compiling with threads" >&6

DL_LIBS="-lld"

+ # Check to enable 64-bit flags for compiler/linker

+ if test "$do64bit" = "yes" ; then

+ if test "$GCC" = "yes" ; then

+ { echo "$as_me:$LINENO: WARNING: \"64bit mode not supported with GCC on $system\"" >&5

+echo "$as_me: WARNING: \"64bit mode not supported with GCC on $system\"" >&2;}

+ else

+ do64bit_ok=yes

+ EXTRA_CFLAGS="-q64"

+ LDFLAGS="-q64"

+ RANLIB="${RANLIB} -X64"

+ AR="${AR} -X64"

+ SHLIB_LD_FLAGS="-b64"

+ fi

+ SHLIB_LD="${TCL_SRC_DIR}/unix/ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry ${SHLIB_LD_FLAGS}"

# On AIX <=v4 systems, libbsd.a has to be linked in to support

# non-blocking file IO. This library has to be linked in after

# the MATH_LIBS or it breaks the pow() function. The way to

@@ -11053,21 +11068,6 @@ fi

_ACEOF

- # Check to enable 64-bit flags for compiler/linker

- if test "$do64bit" = "yes" ; then

- if test "$GCC" = "yes" ; then

- { echo "$as_me:$LINENO: WARNING: \"64bit mode not supported with GCC on $system\"" >&5

-echo "$as_me: WARNING: \"64bit mode not supported with GCC on $system\"" >&2;}

- else

- do64bit_ok=yes

- EXTRA_CFLAGS="-q64"

- LDFLAGS="-q64"

- RANLIB="${RANLIB} -X64"

- AR="${AR} -X64"

- SHLIB_LD_FLAGS="-b64"

- fi

;;

BeOS*)

SHLIB_CFLAGS="-fPIC"

@@ -11449,8 +11449,7 @@ echo "$as_me: WARNING: 64bit mode not supported by gcc" >&2;}

# egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings

# when you inline the string and math operations. Turn this off to

# get rid of the warnings.

- CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"

+ #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"

if test "$have_dl" = yes; then

SHLIB_LD="${CC} -shared"

diff --git a/unix/tcl.m4 b/unix/tcl.m4
index de8dd37..7512f4b 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4

@@ -806,7 +806,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [

ECHO_VERSION='`echo ${VERSION}`'

TCL_LIB_VERSIONS_OK=ok

CFLAGS_DEBUG=-g

- CFLAGS_OPTIMIZE=-O

+ CFLAGS_OPTIMIZE=-O2

if test "$GCC" = "yes" ; then

CFLAGS_WARNING="-Wall -Wconversion -Wno-implicit-int"

else

@@ -836,30 +836,10 @@ dnl AC_CHECK_TOOL(AR, ar)

LIBS="$LIBS -lc"

# AIX-5 uses ELF style dynamic libraries

SHLIB_CFLAGS=""

- SHLIB_LD_LIBS='${LIBS}'

- SHLIB_SUFFIX=".so"

- if test "`uname -m`" = "ia64" ; then

- # AIX-5 uses ELF style dynamic libraries on IA-64, but not PPC

- SHLIB_LD="/usr/ccs/bin/ld -G -z text"

- # AIX-5 has dl* in libc.so

- DL_LIBS=""

- if test "$GCC" = "yes" ; then

- CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'

- else

- CC_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}'

- fi

- LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'

- else

- SHLIB_LD="${TCL_SRC_DIR}/unix/ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry"

- DL_LIBS="-ldl"

- CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'

- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}

- TCL_NEEDS_EXP_FILE=1

- TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.exp'

- fi

# Note: need the LIBS below, otherwise Tk won't find Tcl's

# symbols when dynamically loaded into tclsh.

+ SHLIB_LD_LIBS='${LIBS}'

+ SHLIB_SUFFIX=".so"

DL_OBJS="tclLoadDl.o"

LDFLAGS=""

@@ -879,6 +859,26 @@ dnl AC_CHECK_TOOL(AR, ar)

SHLIB_LD_FLAGS="-b64"

+ if test "`uname -m`" = "ia64" ; then

+ # AIX-5 uses ELF style dynamic libraries on IA-64, but not PPC

+ SHLIB_LD="/usr/ccs/bin/ld -G -z text"

+ # AIX-5 has dl* in libc.so

+ DL_LIBS=""

+ if test "$GCC" = "yes" ; then

+ CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'

+ else

+ CC_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}'

+ fi

+ LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'

+ else

+ SHLIB_LD="${TCL_SRC_DIR}/unix/ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry ${SHLIB_LD_FLAGS}"

+ DL_LIBS="-ldl"

+ CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'

+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}

+ TCL_NEEDS_EXP_FILE=1

+ TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.exp'

+ fi

;;

AIX-*)

if test "${TCL_THREADS}" = "1" -a "$GCC" != "yes" ; then

@@ -890,7 +890,6 @@ dnl AC_CHECK_TOOL(AR, ar)

LIBS="$LIBS -lc"

SHLIB_CFLAGS=""

- SHLIB_LD="${TCL_SRC_DIR}/unix/ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry"

SHLIB_LD_LIBS='${LIBS}'

SHLIB_SUFFIX=".so"

DL_OBJS="tclLoadDl.o"

@@ -908,6 +907,21 @@ dnl AC_CHECK_TOOL(AR, ar)

DL_LIBS="-lld"

+ # Check to enable 64-bit flags for compiler/linker

+ if test "$do64bit" = "yes" ; then

+ if test "$GCC" = "yes" ; then

+ AC_MSG_WARN("64bit mode not supported with GCC on $system")

+ else

+ do64bit_ok=yes

+ EXTRA_CFLAGS="-q64"

+ LDFLAGS="-q64"

+ RANLIB="${RANLIB} -X64"

+ AR="${AR} -X64"

+ SHLIB_LD_FLAGS="-b64"

+ fi

+ SHLIB_LD="${TCL_SRC_DIR}/unix/ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry ${SHLIB_LD_FLAGS}"

# On AIX <=v4 systems, libbsd.a has to be linked in to support

# non-blocking file IO. This library has to be linked in after

# the MATH_LIBS or it breaks the pow() function. The way to

@@ -925,20 +939,6 @@ dnl AC_CHECK_TOOL(AR, ar)

MATH_LIBS="$MATH_LIBS -lbsd"

AC_DEFINE(USE_DELTA_FOR_TZ)

- # Check to enable 64-bit flags for compiler/linker

- if test "$do64bit" = "yes" ; then

- if test "$GCC" = "yes" ; then

- AC_MSG_WARN("64bit mode not supported with GCC on $system")

- else

- do64bit_ok=yes

- EXTRA_CFLAGS="-q64"

- LDFLAGS="-q64"

- RANLIB="${RANLIB} -X64"

- AR="${AR} -X64"

- SHLIB_LD_FLAGS="-b64"

- fi

;;

BeOS*)

SHLIB_CFLAGS="-fPIC"

@@ -1137,8 +1137,7 @@ dnl AC_CHECK_TOOL(AR, ar)

# egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings

# when you inline the string and math operations. Turn this off to

# get rid of the warnings.

- CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"

+ #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"

if test "$have_dl" = yes; then

SHLIB_LD="${CC} -shared"