diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e6466024054c64b821daa24708e4728ff775d69d..d279ed1b1e90912a5bdf5e62c0b081eddb3c02f5 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,18 @@
+2000-11-26 Benjamin Kosnik <bkoz@fillmore.constant.com>
+
+ * tests_flags.in: Export CXX, CXXFLAGS.
+ * mkcheck.in: Grab them.
+
+2000-11-26 David Billinghurst <David.Billinghurst@riotinto.com>
+ Benjamin Kosnik <bkoz@redhat.com>
+
+ * mkcheck.in: Add exe extension to printnow executable, abstract
+ out call to this with TIMER_COMMAND.
+ * configure.target (l_glibcpp_cxxflags): Add cygwin support.
+ * acinclude.m4 (GLIBCPP_CHECK_CTYPE_SUPPORT): Correct paths.
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2000-11-26 Benjamin Kosnik <bkoz@redhat.com>
* testsuite/27_io/istream_unformatted.cc (test05): Fixup.
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index f7fea70cf8d92c25e3170b876ab433d95f3a3bdc..3aa1ac64ec62220f2dd43093a9b9fd58a6b77ba5 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -929,7 +929,7 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE_SUPPORT, [
ctype_newlib=yes, ctype_newlib=no)
AC_MSG_RESULT($ctype_newlib)
if test $ctype_newlib = "yes"; then
- ctype_include_dir="config/newlib"
+ ctype_include_dir="config/os/newlib"
ctype_default=no
fi
fi
diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index 33ac4140f7d72a9c3714af0eba74e3bf994686fd..a4e0148f8370c3937071d53b598dba0e08f8cf34 100644
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -941,7 +941,7 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE_SUPPORT, [
ctype_newlib=yes, ctype_newlib=no)
AC_MSG_RESULT($ctype_newlib)
if test $ctype_newlib = "yes"; then
- ctype_include_dir="config/newlib"
+ ctype_include_dir="config/os/newlib"
ctype_default=no
fi
fi
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 50f5d3f31ad5495f7b1f3e5b46af692ae1d0ee00..6a30003cb793cf6dde856d47ff01951cd37d0d45 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -18081,7 +18081,7 @@ fi
rm -f conftest*
echo "$ac_t""$ctype_newlib" 1>&6
if test $ctype_newlib = "yes"; then
- ctype_include_dir="config/newlib"
+ ctype_include_dir="config/os/newlib"
ctype_default=no
fi
fi
diff --git a/libstdc++-v3/configure.target b/libstdc++-v3/configure.target
index ff06828ce237b4b79b7a897dbed532a035a91bd5..774149fc8c96c66141fb13ae490410d5105d0c0e 100644
--- a/libstdc++-v3/configure.target
+++ b/libstdc++-v3/configure.target
@@ -84,6 +84,9 @@ case "${target_os}" in
bsd* | freebsd*)
os_include_dir="config/os/bsd"
;;
+ cygwin*)
+ os_include_dir="config/os/newlib"
+ ;;
linux*)
os_include_dir="config/os/gnu-linux"
;;
diff --git a/libstdc++-v3/mkcheck.in b/libstdc++-v3/mkcheck.in
index 24c138f9ee5e85ca1252cac74a892064863145a9..e27c4cca38760a208898976532bbd2786cebdc20 100755
--- a/libstdc++-v3/mkcheck.in
+++ b/libstdc++-v3/mkcheck.in
@@ -53,7 +53,7 @@ esac
saved_ifs=$IFS
IFS=':'
set `./tests_flags ${query} $*` || exit 1
-BUILD_DIR=$1; SRC_DIR=$2; PREFIX_DIR=$3; LTCXX=$4; LIBS=$5; LTEXE=$6;
+BUILD_DIR=$1; SRC_DIR=$2; PREFIX_DIR=$3; LTCXX=$4; LIBS=$5; LTEXE=$6; CXX=$7; CXXFLAGS=$8;
IFS=$saved_ifs
# Set up the testing directory, which should be in a directory called
@@ -82,6 +82,13 @@ MAX_MEM_USAGE=3072
#
# 2: clean, make files, append general test info
#
+
+# Remove old executables.
+rm -rf "$TEST_DIR"/*exe
+
+# Remove old core files (which now get left in cwd, not $TEST_DIR).
+rm -rf ./*core*
+
if [ -f $RESULTS_FILE ]; then
rm $RESULTS_FILE
fi
@@ -101,18 +108,13 @@ if [ ! -f "$TESTS_FILE" ]; then
fi
# Nasty solution to replace GNU date(1)'s %s time_t output function.
-if [ ! -x "$TEST_DIR/printnow" ]; then
- echo "making utility $TEST_DIR/printnow"
- gcc -o "$TEST_DIR/printnow" "$SRC_DIR/testsuite/printnow.c"
- strip "$TEST_DIR/printnow"
+TIMER_COMMAND=$TEST_DIR/printnow.exe
+if [ ! -x "$TIMER_COMMAND" ]; then
+ echo "making utility $TIMER_COMMAND"
+ gcc -o "$TIMER_COMMAND" "$SRC_DIR/testsuite/printnow.c"
+ strip "$TIMER_COMMAND"
fi
-# Remove old executables.
-rm -rf "$TEST_DIR"/*exe
-
-# Remove old core files (which now get left in cwd, not $TEST_DIR).
-rm -rf ./*core*
-
# Copy over the data files for filebufs
cp $SRC_DIR/testsuite/27_io/*.txt $TEST_DIR
cp $SRC_DIR/testsuite/27_io/*.tst $TEST_DIR
@@ -122,7 +124,7 @@ chmod u+w $TEST_DIR/*.tst
# Emit useful info about compiler and platform
echo "host: $(uname -mrsv)" >> $RESULTS_FILE
echo "compiler: $($CXX -v 2>&1)" >> $RESULTS_FILE
-echo "compiler flags: $CXX_FLAG" >> $RESULTS_FILE
+echo "compiler flags: $CXXFLAGS" >> $RESULTS_FILE
echo "date: $(date +%Y%m%d)" >> $RESULTS_FILE
echo "" >> $RESULTS_FILE
@@ -297,9 +299,9 @@ test_file()
# eventually have to calculate time_t anyhow. Or 3) just grab two
# time_t's (no more overhead than grabbing two date(1)'s).
compiler_invocation="$LTCXX $S_FLAG $SRC_NAME -o $EXENAME $LIBS"
- COMP_TIME_START=$($TEST_DIR/printnow)
+ COMP_TIME_START=$($TIMER_COMMAND)
$compiler_invocation >> compile.out 2>&1
- COMP_TIME_END=$($TEST_DIR/printnow)
+ COMP_TIME_END=$($TIMER_COMMAND)
if [ $COMP_TIME_START -lt $COMP_TIME_END ]; then
C_TIME=$[ $COMP_TIME_END - $COMP_TIME_START ]
@@ -366,7 +368,7 @@ echo "------------------------------------------------------------------------"
printf "static\tshared\ttest\n"
echo "------------------------------------------------------------------------"
-TEST_TIME_START=$($TEST_DIR/printnow)
+TEST_TIME_START=$($TIMER_COMMAND)
for NAME in `cat $TESTS_FILE`
do
PRE_NAME="$TEST_DIR/`basename $NAME`"
@@ -389,7 +391,7 @@ do
echo "" >> $RESULTS_FILE
done
-TEST_TIME_END=$($TEST_DIR/printnow)
+TEST_TIME_END=$($TIMER_COMMAND)
#
diff --git a/libstdc++-v3/tests_flags.in b/libstdc++-v3/tests_flags.in
index be6da64aa6433e612bc5cf717fe6a9c2ac76c1d4..d5215b9c1776ea71efa194d3922893eb377b06a3 100644
--- a/libstdc++-v3/tests_flags.in
+++ b/libstdc++-v3/tests_flags.in
@@ -29,9 +29,10 @@
# LTCXX libtoolized command to compile a C++ program
# LIBS flags to pass to the linker
# LTEXE libtoolized command to run a compiled C++ program
+# CXX which C++ compiler is being used
+# CXXFLAGS special C++ flags used
#
-
##
## Utility functions
##
@@ -173,5 +174,5 @@ case ${query} in
;;
esac
-echo ${BUILD_DIR}:${SRC_DIR}:${PREFIX_DIR}:${LTCXX}:${LIBS}:${LTEXE}
+echo ${BUILD_DIR}:${SRC_DIR}:${PREFIX_DIR}:${LTCXX}:${LIBS}:${LTEXE}:${CXX}:${CXXFLAGS}
exit 0