summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpme <pme@138bc75d-0d04-0410-961f-82ee72b054a4>2002-06-07 20:25:04 +0000
committerpme <pme@138bc75d-0d04-0410-961f-82ee72b054a4>2002-06-07 20:25:04 +0000
commit776d5901dcadba02815f12be6ffa4cb9d68fd457 (patch)
treecfa174b426c97d515069b810c088ae9679acd403
parentdb1d6c19af78094f9736c339a6fa7386e498340f (diff)
downloadppe42-gcc-776d5901dcadba02815f12be6ffa4cb9d68fd457.tar.gz
ppe42-gcc-776d5901dcadba02815f12be6ffa4cb9d68fd457.zip
2002-06-07 Phil Edwards <pme@gcc.gnu.org>
* mkcheck.in: Link against local testsuite library. * testsuite/testsuite_hooks.h (__set_testsuite_memlimit): Move null implementation out... * testsuite/testsuite_hooks.cc: ...to here. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@54349 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libstdc++-v3/ChangeLog7
-rwxr-xr-xlibstdc++-v3/mkcheck.in3
-rw-r--r--libstdc++-v3/testsuite/testsuite_hooks.cc3
-rw-r--r--libstdc++-v3/testsuite/testsuite_hooks.h3
4 files changed, 13 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0384cf3bfc0..2f7993b663b 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2002-06-07 Phil Edwards <pme@gcc.gnu.org>
+
+ * mkcheck.in: Link against local testsuite library.
+ * testsuite/testsuite_hooks.h (__set_testsuite_memlimit): Move null
+ implementation out...
+ * testsuite/testsuite_hooks.cc: ...to here.
+
2002-06-06 Loren J. Rittle <ljrittle@acm.org>
* src/Makefile.am (AUTOMAKE_OPTIONS): Use cygnus-style generation.
diff --git a/libstdc++-v3/mkcheck.in b/libstdc++-v3/mkcheck.in
index b104244dba6..c856b052152 100755
--- a/libstdc++-v3/mkcheck.in
+++ b/libstdc++-v3/mkcheck.in
@@ -314,7 +314,8 @@ test_file()
# and harder as we try compiling at, say, top of the hour; we would
# 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"
+ our_libs="-L$TEST_DIR -lv3test"
+ compiler_invocation="$LTCXX $S_FLAG $SRC_NAME -o $EXENAME $our_libs"
echo $compiler_invocation >> compile.out 2>&1
COMP_TIME_START=$($TIMER_COMMAND)
$compiler_invocation >> compile.out 2>&1
diff --git a/libstdc++-v3/testsuite/testsuite_hooks.cc b/libstdc++-v3/testsuite/testsuite_hooks.cc
index 53bd753b1a8..4e8928c77ab 100644
--- a/libstdc++-v3/testsuite/testsuite_hooks.cc
+++ b/libstdc++-v3/testsuite/testsuite_hooks.cc
@@ -67,6 +67,9 @@ __set_testsuite_memlimit(float __size)
setrlimit(RLIMIT_AS, &r);
#endif
}
+#else
+void
+__set_testsuite_memlimit(float) { }
#endif /* _GLIBCPP_MEM_LIMITS */
diff --git a/libstdc++-v3/testsuite/testsuite_hooks.h b/libstdc++-v3/testsuite/testsuite_hooks.h
index 4412336d47f..a4be70a9b23 100644
--- a/libstdc++-v3/testsuite/testsuite_hooks.h
+++ b/libstdc++-v3/testsuite/testsuite_hooks.h
@@ -67,8 +67,7 @@
#ifndef _GLIBCPP_MEM_LIMITS
// Don't do memory limits.
extern void
-__set_testsuite_memlimit(float x = 0)
-{ }
+__set_testsuite_memlimit(float x = 0);
#else
OpenPOWER on IntegriCloud