aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Mitchell <mark@codesourcery.com>1999-12-19 05:36:13 +0000
committerMark Mitchell <mmitchel@gcc.gnu.org>1999-12-19 05:36:13 +0000
commit2a14e2147b3b022eb0bb5581b77c49f658b42927 (patch)
treeb588729c610303cf3734b760c21d823ef33ad159
parente05eb7616897fce02c5e04ccfb66bd6db102a1df (diff)
downloadgcc-2a14e2147b3b022eb0bb5581b77c49f658b42927.zip
gcc-2a14e2147b3b022eb0bb5581b77c49f658b42927.tar.gz
gcc-2a14e2147b3b022eb0bb5581b77c49f658b42927.tar.bz2
crtstuff.c (__do_global_ctors_aux): Do not call __cxa_finalize in a main program.
* crtstuff.c (__do_global_ctors_aux): Do not call __cxa_finalize in a main program. From-SVN: r31023
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/crtstuff.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 54eead1..3c92b7e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+1999-12-18 Mark Mitchell <mark@codesourcery.com>
+
+ * crtstuff.c (__do_global_ctors_aux): Do not call __cxa_finalize
+ in a main program.
+
Sat Dec 18 20:42:43 1999 Richard Henderson <rth@cygnus.com>
* cccp.c (main): Define __STDC_VERSION__ as necessary.
diff --git a/gcc/crtstuff.c b/gcc/crtstuff.c
index 53dae7c..c0a6ae0 100644
--- a/gcc/crtstuff.c
+++ b/gcc/crtstuff.c
@@ -172,8 +172,10 @@ __do_global_dtors_aux (void)
if (completed)
return;
- if (__dso_handle && __cxa_finalize)
+#ifdef CRTSTUFFS_O
+ if (__cxa_finalize)
__cxa_finalize (__dso_handle);
+#endif
while (*p)
{