This is the mail archive of the
libstdc++@sourceware.cygnus.com
mailing list for the libstdc++ project.
enabling -O2 with gcc 2.96 and later
- To: libstdc++ at sourceware dot cygnus dot com
- Subject: enabling -O2 with gcc 2.96 and later
- From: Phil Edwards <pedwards at jaj dot com>
- Date: Fri, 17 Dec 1999 13:14:13 -0500
My first approach was wonderfully freakin' braindead. This works on
both 2.95 /and/ 2.96 (duh). The change is actually minor, but the diff
to 'configure' is huge because all the line numbers changed... sorry
'bout the bandwidth.
Am I fogetting anything? Okay to check in?
1999-12-17 Phil Edwards <pedwards@jaj.com>
* configure.in: Add OPTLEVEL, -O2 for gcc 2.96+, nothing otherwise.
* configure: Regenerate.
* src/Makefile.am: Use OPTLEVEL in AM_CXXFLAGS.
* src/Makefile.in: Regenerate. Also picks up OTHER_CXXFLAGS rename
to OPTIMIZE_CXXFLAGS from a previous revision (1.96) to Makefile.am.
Index: configure.in
===================================================================
RCS file: /cvs/libstdc++/libstdc++/configure.in,v
retrieving revision 1.35
diff -u -3 -r1.35 configure.in
--- configure.in 1999/12/02 08:07:41 1.35
+++ configure.in 1999/12/17 17:36:16
@@ -10,6 +10,14 @@
AC_PROG_CXX
AC_PROG_LN_S
+# How optimal can we be?
+OPTLEVEL=
+verstring=`$CXX --version | cut -d. -f2 | cut -d' ' -f1`
+if test $verstring -gt 95 ; then
+ OPTLEVEL='-O2'
+fi
+AC_SUBST(OPTLEVEL)
+
# More options.
AM_MAINTAINER_MODE
AC_EXEEXT
Index: configure
===================================================================
RCS file: /cvs/libstdc++/libstdc++/configure,v
retrieving revision 1.36
diff -u -3 -r1.36 configure
--- configure 1999/12/02 08:07:41 1.36
+++ configure 1999/12/17 17:36:17
@@ -1851,9 +1851,17 @@
fi
+# How optimal can we be?
+OPTLEVEL=
+verstring=`$CXX --version | cut -d. -f2 | cut -d' ' -f1`
+if test $verstring -gt 95 ; then
+ OPTLEVEL='-O2'
+fi
+
+
# More options.
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1857: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1865: checking whether to enable maintainer-specific portions of Makefiles" >&5
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval="$enable_maintainer_mode"
@@ -1876,12 +1884,12 @@
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:1880: checking for Cygwin environment" >&5
+echo "configure:1888: checking for Cygwin environment" >&5
if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1885 "configure"
+#line 1893 "configure"
#include "confdefs.h"
int main() {
@@ -1892,7 +1900,7 @@
return __CYGWIN__;
; return 0; }
EOF
-if { (eval echo configure:1896: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cygwin=yes
else
@@ -1909,19 +1917,19 @@
CYGWIN=
test "$ac_cv_cygwin" = yes && CYGWIN=yes
echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:1913: checking for mingw32 environment" >&5
+echo "configure:1921: checking for mingw32 environment" >&5
if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1918 "configure"
+#line 1926 "configure"
#include "confdefs.h"
int main() {
return __MINGW32__;
; return 0; }
EOF
-if { (eval echo configure:1925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1933: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_mingw32=yes
else
@@ -1940,7 +1948,7 @@
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1944: checking for executable suffix" >&5
+echo "configure:1952: checking for executable suffix" >&5
if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1950,7 +1958,7 @@
rm -f conftest*
echo 'int main () { return 0; }' > conftest.$ac_ext
ac_cv_exeext=
- if { (eval echo configure:1954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ if { (eval echo configure:1962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
for file in conftest.*; do
case $file in
*.c | *.o | *.obj) ;;
@@ -1975,7 +1983,7 @@
# Math-related tests.
#
echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:1979: checking for sin in -lm" >&5
+echo "configure:1987: checking for sin in -lm" >&5
ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1983,7 +1991,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1987 "configure"
+#line 1995 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1994,7 +2002,7 @@
sin()
; return 0; }
EOF
-if { (eval echo configure:1998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2024,12 +2032,12 @@
carg cargf nan hypot hypotf atan2f expf copysignf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2028: checking for $ac_func" >&5
+echo "configure:2036: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2033 "configure"
+#line 2041 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2052,7 +2060,7 @@
; return 0; }
EOF
-if { (eval echo configure:2056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2083,12 +2091,12 @@
# the non-complex functions.
USE_LONG_DOUBLE=no
echo $ac_n "checking for sinl""... $ac_c" 1>&6
-echo "configure:2087: checking for sinl" >&5
+echo "configure:2095: checking for sinl" >&5
if eval "test \"`echo '$''{'ac_cv_func_sinl'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2092 "configure"
+#line 2100 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char sinl(); below. */
@@ -2111,7 +2119,7 @@
; return 0; }
EOF
-if { (eval echo configure:2115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_sinl=yes"
else
@@ -2130,12 +2138,12 @@
csqrtl ctanhl ctanl cargl hypotl signbitl c_logl clog10l
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2134: checking for $ac_func" >&5
+echo "configure:2142: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2139 "configure"
+#line 2147 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2158,7 +2166,7 @@
; return 0; }
EOF
-if { (eval echo configure:2162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2196,12 +2204,12 @@
strtof strtold fabsf sincos sincosf sincosl finite qfinite fpclass qfpclass
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2200: checking for $ac_func" >&5
+echo "configure:2208: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2205 "configure"
+#line 2213 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2224,7 +2232,7 @@
; return 0; }
EOF
-if { (eval echo configure:2228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2258,12 +2266,12 @@
_strtof _strtold _fabsf _sincos _sincosf _sincosl _finite _qfinite _fpclass _qfpclass
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2262: checking for $ac_func" >&5
+echo "configure:2270: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2267 "configure"
+#line 2275 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2286,7 +2294,7 @@
; return 0; }
EOF
-if { (eval echo configure:2290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2313,14 +2321,14 @@
# Test for builtin math functions.
cat > conftest.$ac_ext <<EOF
-#line 2317 "configure"
+#line 2325 "configure"
#include "confdefs.h"
#include <math.h>
int main() {
float foo(void) { __builtin_sinf(0.0); }
; return 0; }
EOF
-if { (eval echo configure:2324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2332: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
use_builtin_sinf=yes
else
@@ -2338,14 +2346,14 @@
fi
cat > conftest.$ac_ext <<EOF
-#line 2342 "configure"
+#line 2350 "configure"
#include "confdefs.h"
#include <math.h>
int main() {
float foo(void) { __builtin_cosf(0.0); }
; return 0; }
EOF
-if { (eval echo configure:2349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
use_builtin_cosf=yes
else
@@ -2363,14 +2371,14 @@
fi
cat > conftest.$ac_ext <<EOF
-#line 2367 "configure"
+#line 2375 "configure"
#include "confdefs.h"
#include <math.h>
int main() {
float foo(void) { __builtin_fabsf(0.0); }
; return 0; }
EOF
-if { (eval echo configure:2374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
use_builtin_fabsf=yes
else
@@ -2388,14 +2396,14 @@
fi
cat > conftest.$ac_ext <<EOF
-#line 2392 "configure"
+#line 2400 "configure"
#include "confdefs.h"
#include <math.h>
int main() {
float foo(void) { __builtin_sqrtf(0.0); }
; return 0; }
EOF
-if { (eval echo configure:2399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2407: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
use_builtin_sqrtf=yes
else
@@ -2415,7 +2423,7 @@
LIBS="$save_LIBS"
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2419: checking how to run the C preprocessor" >&5
+echo "configure:2427: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -2430,13 +2438,13 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 2434 "configure"
+#line 2442 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2440: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -2447,13 +2455,13 @@
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 2451 "configure"
+#line 2459 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2457: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2465: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -2464,13 +2472,13 @@
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 2468 "configure"
+#line 2476 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2474: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2482: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -2496,17 +2504,17 @@
ac_safe=`echo "complex.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for complex.h""... $ac_c" 1>&6
-echo "configure:2500: checking for complex.h" >&5
+echo "configure:2508: checking for complex.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2505 "configure"
+#line 2513 "configure"
#include "confdefs.h"
#include <complex.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2518: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2534,17 +2542,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2538: checking for $ac_hdr" >&5
+echo "configure:2546: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2543 "configure"
+#line 2551 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2548: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2556: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2579,14 +2587,14 @@
&& test "$ac_cv_header_sys_machine_h" = no
then
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:2583: checking whether byte ordering is bigendian" >&5
+echo "configure:2591: checking whether byte ordering is bigendian" >&5
if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_bigendian=unknown
# See if sys/param.h defines the BYTE_ORDER macro.
cat > conftest.$ac_ext <<EOF
-#line 2590 "configure"
+#line 2598 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -2597,11 +2605,11 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:2601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# It does; now see whether it defined to BIG_ENDIAN or not.
cat > conftest.$ac_ext <<EOF
-#line 2605 "configure"
+#line 2613 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -2612,7 +2620,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:2616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_bigendian=yes
else
@@ -2632,7 +2640,7 @@
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 2636 "configure"
+#line 2644 "configure"
#include "confdefs.h"
main () {
/* Are we little or big endian? From Harbison&Steele. */
@@ -2645,7 +2653,7 @@
exit (u.c[sizeof (long) - 1] == 1);
}
EOF
-if { (eval echo configure:2649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_bigendian=no
else
@@ -2674,12 +2682,12 @@
for ac_func in wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2678: checking for $ac_func" >&5
+echo "configure:2686: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2683 "configure"
+#line 2691 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2702,7 +2710,7 @@
; return 0; }
EOF
-if { (eval echo configure:2706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2731,17 +2739,17 @@
ac_safe=`echo "wchar.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for wchar.h""... $ac_c" 1>&6
-echo "configure:2735: checking for wchar.h" >&5
+echo "configure:2743: checking for wchar.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2740 "configure"
+#line 2748 "configure"
#include "confdefs.h"
#include <wchar.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2745: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2760,14 +2768,14 @@
# Test wchar.h for mbstate_t, which is needed for char_traits and others.
cat > conftest.$ac_ext <<EOF
-#line 2764 "configure"
+#line 2772 "configure"
#include "confdefs.h"
#include <wchar.h>
int main() {
mbstate_t teststate;
; return 0; }
EOF
-if { (eval echo configure:2771: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
use_native_mbstatet=yes
else
@@ -2788,14 +2796,14 @@
# Test wchar.h for WCHAR_MIN, WCHAR_MAX, which is needed before
# numeric_limits can instantiate type_traits<wchar_t>
cat > conftest.$ac_ext <<EOF
-#line 2792 "configure"
+#line 2800 "configure"
#include "confdefs.h"
#include <wchar.h>
int main() {
int i = WCHAR_MIN; int j = WCHAR_MAX;
; return 0; }
EOF
-if { (eval echo configure:2799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2807: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
has_wchar_minmax=yes
else
@@ -2817,9 +2825,9 @@
# Test wchar.h for WEOF, which is what we use to determine whether
# to specialize for wchar_t or not.
echo $ac_n "checking for wide character support""... $ac_c" 1>&6
-echo "configure:2821: checking for wide character support" >&5
+echo "configure:2829: checking for wide character support" >&5
cat > conftest.$ac_ext <<EOF
-#line 2823 "configure"
+#line 2831 "configure"
#include "confdefs.h"
#include <wchar.h>
@@ -2828,7 +2836,7 @@
wint_t i = WEOF;
; return 0; }
EOF
-if { (eval echo configure:2832: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
has_weof=yes
else
@@ -2862,13 +2870,13 @@
# Test for glibc 2. In this case we need not compile the libio.
echo $ac_n "checking for glibc 2""... $ac_c" 1>&6
-echo "configure:2866: checking for glibc 2" >&5
+echo "configure:2874: checking for glibc 2" >&5
if eval "test \"`echo '$''{'use_glibc2'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2872 "configure"
+#line 2880 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
@@ -2878,7 +2886,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:2882: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2890: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
use_glibc2=yes
else
@@ -2904,17 +2912,17 @@
# Test for <ctype> _ISbit, so that ctype<char> will work correctly
ac_safe=`echo "ctype.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ctype.h""... $ac_c" 1>&6
-echo "configure:2908: checking for ctype.h" >&5
+echo "configure:2916: checking for ctype.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2913 "configure"
+#line 2921 "configure"
#include "confdefs.h"
#include <ctype.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2932,14 +2940,14 @@
echo "$ac_t""yes" 1>&6
cat > conftest.$ac_ext <<EOF
-#line 2936 "configure"
+#line 2944 "configure"
#include "confdefs.h"
#include <ctype.h>
int main() {
int i = _ISspace;
; return 0; }
EOF
-if { (eval echo configure:2943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
use_native_ctype=yes
else
@@ -2962,19 +2970,19 @@
if test $ac_cv_header_locale_h = yes; then
echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:2966: checking for LC_MESSAGES" >&5
+echo "configure:2974: checking for LC_MESSAGES" >&5
if eval "test \"`echo '$''{'ac_cv_val_LC_MESSAGES'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2971 "configure"
+#line 2979 "configure"
#include "confdefs.h"
#include <locale.h>
int main() {
return LC_MESSAGES
; return 0; }
EOF
-if { (eval echo configure:2978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_val_LC_MESSAGES=yes
else
@@ -2998,7 +3006,7 @@
echo $ac_n "checking for GNU C++ float __complex__ support""... $ac_c" 1>&6
-echo "configure:3002: checking for GNU C++ float __complex__ support" >&5
+echo "configure:3010: checking for GNU C++ float __complex__ support" >&5
if eval "test \"`echo '$''{'glibcpp_cv_float_complex'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3031,14 +3039,14 @@
};
EOB
cat > conftest.$ac_ext <<EOF
-#line 3035 "configure"
+#line 3043 "configure"
#include "confdefs.h"
#include "conftest.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:3042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
glibcpp_cv_float_complex=ok
else
@@ -3229,6 +3237,7 @@
s%@LN_S@%$LN_S%g
s%@LIBTOOL@%$LIBTOOL%g
s%@CXX@%$CXX%g
+s%@OPTLEVEL@%$OPTLEVEL%g
s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
s%@MAINT@%$MAINT%g
Index: src/Makefile.am
===================================================================
RCS file: /cvs/libstdc++/libstdc++/src/Makefile.am,v
retrieving revision 1.58
diff -u -3 -r1.58 Makefile.am
--- Makefile.am 1999/12/11 00:19:45 1.58
+++ Makefile.am 1999/12/17 17:36:17
@@ -9,7 +9,7 @@
# OPTIMIZE_CXXFLAGS = -fsquangle -fhonor-std -fnew-exceptions \
# -ffunction-sections -fvtable-gc -Wl,--gc-sections
CXXFLAGS = -g
-AM_CXXFLAGS = -O2 -D_GNU_SOURCE -fno-implicit-templates \
+AM_CXXFLAGS = @OPTLEVEL@ -D_GNU_SOURCE -fno-implicit-templates \
-Wall -Wno-format -W -Wwrite-strings -Winline $(WERROR) \
$(OTHER_CXXFLAGS)
Index: src/Makefile.in
===================================================================
RCS file: /cvs/libstdc++/libstdc++/src/Makefile.in,v
retrieving revision 1.69
diff -u -3 -r1.69 Makefile.in
--- Makefile.in 1999/12/11 00:19:45 1.69
+++ Makefile.in 1999/12/17 17:36:17
@@ -72,6 +72,7 @@
MAKEINFO = @MAKEINFO@
NM = @NM@
OBJDUMP = @OBJDUMP@
+OPTLEVEL = @OPTLEVEL@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
USE_LONG_DOUBLE = @USE_LONG_DOUBLE@
@@ -85,10 +86,10 @@
# in libtool since this would add -lstdc++ to the link line which of
# course is impossible.
WERROR = -Werror
-# OTHER_CXXFLAGS = -fsquangle -fhonor-std -fnew-exceptions \
+# OPTIMIZE_CXXFLAGS = -fsquangle -fhonor-std -fnew-exceptions \
# -ffunction-sections -fvtable-gc -Wl,--gc-sections
CXXFLAGS = -g
-AM_CXXFLAGS = -O2 -D_GNU_SOURCE -fno-implicit-templates \
+AM_CXXFLAGS = @OPTLEVEL@ -D_GNU_SOURCE -fno-implicit-templates \
-Wall -Wno-format -W -Wwrite-strings -Winline $(WERROR) \
$(OTHER_CXXFLAGS)