* i386/sco5.h (HAVE_ATEXIT): Revert last change.

From-SVN: r16640

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1f9219c8656777319c2f89147b6e1a00fd9b00da..56797ef653eadd02f94e309cfe7d7301b0eb12e2 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+Fri Nov 21 10:13:11 1997  Robert Lipe (robertl@dgii.com)
+
+       * i386/sco5.h (HAVE_ATEXIT): Revert last change.
+
 Thu Nov 20 16:11:50 1997  Richard Henderson  <rth@cygnus.com>
 
        * alpha.c (alpha_emit_set_const_1): Handle narrow hosts better.

diff --git a/gcc/config/i386/sco5.h b/gcc/config/i386/sco5.h
index 79bc4c5a6327756e55fe72634eb188c58598aee0..8a0eb0b6772f52a93a64d89358bb6b24f66b614a 100644 (file)
--- a/gcc/config/i386/sco5.h
+++ b/gcc/config/i386/sco5.h
@@ -945,6 +945,7 @@ compiler at the end of the day. Onward we go ...
 
 # if defined (_SCO_ELF)
 #  define OBJECT_FORMAT_ELF
+#  define HAVE_ATEXIT 1
 #  define INIT_SECTION_ASM_OP INIT_SECTION_ASM_OP_ELF
 #  define FINI_SECTION_ASM_OP FINI_SECTION_ASM_OP_ELF
 #  define DTORS_SECTION_ASM_OP DTORS_SECTION_ASM_OP_ELF

diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p9732b.C b/gcc/testsuite/g++.old-deja/g++.mike/p9732b.C
index aadb374b996de4e206098518e32834061e171bf6..eabc9f2760d4b4720707745816c6fd0918ec597d 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.mike/p9732b.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p9732b.C
@@ -1,42 +1,2 @@
-// prms-id: 9732
-
-int count;
-int bail = 0;
-
-struct base {
-  base () { ++count; }
-  ~base () { --count; }
-  base(const base&o) { ++count; }
-};
-
-class D {
-public:
-  ~D() {
-    if (bail++)
-      {
-       // On some Linux boxes, we run the dtor for d twice,
-       // once before exit, and once after!
-       abort ();
-      }
-    else
-      {
-       if (count != 0)
-         exit (1);
-       exit (0);
-      }
-  }
-} d;
-
-base base_object;
-
-base base_returning_function ();
-
-const base& base_ref = base_returning_function ();
-
-int main () {
-}
-
-base base_returning_function () {
-  base local_base_object;
-  return local_base_object;
-}
+         _exit (1);
+       _exit (0);