summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/crtstuff.c7
2 files changed, 11 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 647638c5d32..dc5659e6c7b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+Tue Nov 25 10:00:42 1997 Jeffrey A Law (law@cygnus.com)
+
+ * crtstuff.c (do_global_dtors_aux): Handle multiple calls better.
+
Tue Nov 25 01:26:55 1997 Bruno Haible <haible@ilog.fr>:
* dwarf2out.c (ASM_OUTPUT_DWARF_DELTA1): Implement.
diff --git a/gcc/crtstuff.c b/gcc/crtstuff.c
index bcb5cc50bf0..c120862139a 100644
--- a/gcc/crtstuff.c
+++ b/gcc/crtstuff.c
@@ -128,6 +128,11 @@ static void
__do_global_dtors_aux ()
{
static func_ptr *p = __DTOR_LIST__ + 1;
+ static int completed = 0;
+
+ if (completed)
+ return;
+
while (*p)
{
p++;
@@ -137,8 +142,10 @@ __do_global_dtors_aux ()
#ifdef EH_FRAME_SECTION_ASM_OP
__deregister_frame (__EH_FRAME_BEGIN__);
#endif
+ completed = 1;
}
+
/* Stick a call to __do_global_dtors_aux into the .fini section. */
static void