From ffb2827932c79e226d5d6f3386a054c1e09d8f84 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Sat, 4 Nov 2000 20:00:52 +0000 Subject: [PATCH] p755.C: Tweak handling of exit. * g++.old-deja/g++.mike/p755.C: Tweak handling of exit. * g++.old-deja/g++.mike/p755a.C: Likewise. * g++.old-deja/g++.mike/p9706.C: Don't assume that the standard library makes no calls to `operator new' during initialization. From-SVN: r37257 --- gcc/testsuite/ChangeLog | 7 +++++++ gcc/testsuite/g++.old-deja/g++.mike/p755.C | 5 +++-- gcc/testsuite/g++.old-deja/g++.mike/p755a.C | 4 ++-- gcc/testsuite/g++.old-deja/g++.mike/p9706.C | 4 ++++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e09ae59887e..8a6c412fde1 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2000-11-04 Mark Mitchell + + * g++.old-deja/g++.mike/p755.C: Tweak handling of exit. + * g++.old-deja/g++.mike/p755a.C: Likewise. + * g++.old-deja/g++.mike/p9706.C: Don't assume that the standard + library makes no calls to `operator new' during initialization. + 2000-11-04 Neil Booth * gcc.dg/cpp/include2.c: New tests. diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p755.C b/gcc/testsuite/g++.old-deja/g++.mike/p755.C index 256c985e271..a8f4476f256 100644 --- a/gcc/testsuite/g++.old-deja/g++.mike/p755.C +++ b/gcc/testsuite/g++.old-deja/g++.mike/p755.C @@ -2,11 +2,12 @@ // prms-id: 755 #include -extern "C" void exit(int); + +extern "C" void _exit(int); void* operator new(size_t sz) throw (std::bad_alloc) { void* p = 0; - exit(0); + _exit(0); return p; } diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p755a.C b/gcc/testsuite/g++.old-deja/g++.mike/p755a.C index 73172c159ce..29d58b8e7a3 100644 --- a/gcc/testsuite/g++.old-deja/g++.mike/p755a.C +++ b/gcc/testsuite/g++.old-deja/g++.mike/p755a.C @@ -1,10 +1,10 @@ // It checks to see if you can define your own global delete operator. // prms-id: 755 -extern "C" void exit(int); +extern "C" void _exit(int); void operator delete(void *p) throw() { - exit(0); + _exit(0); } int main () { diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p9706.C b/gcc/testsuite/g++.old-deja/g++.mike/p9706.C index c21f6c6585c..8b8739f50d1 100644 --- a/gcc/testsuite/g++.old-deja/g++.mike/p9706.C +++ b/gcc/testsuite/g++.old-deja/g++.mike/p9706.C @@ -19,6 +19,10 @@ public: int main() { int i; + // The standard library may have called new and/or delete during + // startup, so we have to reset the counter here. + count = 0; + for( i = 0; i < 10; i++ ) { try { throw A(); -- 2.30.2