Changeset 439 for trunk/src/emx

Timestamp:

Jul 25, 2003, 3:37:21 PM (22 years ago)

Author:

bird

Message:

#577: Fixed problem with the use of atexit(ehTerm) for DLLs.

File:

• trunk/src/emx/src/lib/startup/dllinit.c (modified) (2 diffs, 1 prop)

trunk/src/emx/src/lib/startup/dllinit.c

@@ -1 @@
-/* This is the startup code for gcc.dll (and can be used as well for any other
-   DLL which uses exceptions). It should call __ehInit() as any other dynamic
-   library which uses exceptions, otherwise the C++ programs linked to it will
-   fail to catch exceptions.
-
- -= This is duplicated in libgcc and this copy must be removed when  =-
- -= we've done a new release!                                        =-
-
-    */
-
+/*  */
+#include <emx/startup.h>
 extern int _CRT_init (void);
 extern void __ctordtorInit (void);
 extern void __ctordtorTerm (void);
-extern void __ehInit (void);
-extern void __ehTerm (void);
+extern void __ehInitDLL (void);
+#pragma weak __ehInitDLL
+extern void __ehTermDLL (void);
+#pragma weak __ehTermDLL
 
-unsigned long _System _DLL_InitTerm (unsigned long mod_handle, unsigned long flag)
+/**
+ * This is the typical DLL startup code. __ehInitDLL and __ehTermDLL is called
+ * are for exception handler stuff in gcc, the two functions will be linked if 
+ * there is exception handler info in the module. (Btw. if these calls wasn't 
+ * made we would fail to catch exceptions in C++ code.)
+ * @returns 1 on success.
+ * @returns 0 on failure.
+ * @param   hmod    Handle of this DLL.
+ * @param   flag    0 init.
+ *                  1 term.
+ * @remark  This function is called from dll0.asm.
+ */
+unsigned _System _DLL_InitTerm (unsigned hmod, unsigned flag)
 {
   switch (flag)
@@ -21 +27 @@
     case 0:
       if (_CRT_init () != 0)
-        return 0;
+        break;
+      if (__ehInitDLL)
+        __ehInitDLL ();
       __ctordtorInit ();
-      __ehInit ();
       return 1;
     case 1:
-      __ehTerm ();
       __ctordtorTerm ();
+      if (__ehTermDLL)
+        __ehTermDLL ();
       return 1;
-    default:
-      return 0;
   }
+  return 0;
 }