Changeset 548

Timestamp:

Aug 8, 2003, 2:09:48 AM (22 years ago)

Author:

bird

Message:

#577: Changed ehInit/Term to be in separate SETV lists to ensure correct order.

Location:

trunk/src

Files:

• emx/src/lib/startup/386/crt0.s (modified) (1 diff, 1 prop)
• emx/src/lib/startup/386/dll0.s (modified) (3 diffs, 1 prop)
• gcc/gcc/config/i386/emx-ctordtor.c (modified) (3 diffs, 1 prop)
• gcc/gcc/config/i386/emx-eh.c (modified) (4 diffs, 1 prop)

trunk/src/emx/src/lib/startup/386/crt0.s

@@ -63 +63 @@
         .stabs  "___crtexit1__", 21, 0, 0, 0xffffffff
         .stabs  "___eh_frame__", 21, 0, 0, 0xffffffff
+        .stabs  "___eh_init__", 21, 0, 0, 0xffffffff
+        .stabs  "___eh_term__", 21, 0, 0, 0xffffffff
+

trunk/src/emx/src/lib/startup/386/dll0.s

@@ -20 +20 @@
         cld
     jmp     _DLL_InitTerm
-/*    
+/*
         pushl   %ebp
         movl    %esp, %ebp
@@ -29 +29 @@
         popl    %ebp
         ret
-*/    
+*/
 
         .data
@@ -43 +43 @@
         .stabs  "___crtexit1__", 21, 0, 0, 0xffffffff
         .stabs  "___eh_frame__", 21, 0, 0, 0xffffffff
+        .stabs  "___eh_init__", 21, 0, 0, 0xffffffff
+        .stabs  "___eh_term__", 21, 0, 0, 0xffffffff
+

trunk/src/gcc/gcc/config/i386/emx-ctordtor.c

@@ -1 +1 @@
 /* At startup call all constructor and at shutdown all destructor functions.
-   Optionally initializes frame unwind info (weak linkage). */
+   Optionally initializes frame unwind info (if emx-eh is linked in). */
 
 extern int __CTOR_LIST__;
 extern int __DTOR_LIST__;
+extern int __eh_init__;
+extern int __eh_term__;
 extern void __ctordtorInit1 (int *);
 extern void __ctordtorTerm1 (int *);
 
-/** Exception handler stuff init indicator. 0 means not inited, 1 means inited. */
+/** Init indicator. 0 means not inited, 1 means inited. */
 static int inited;
 extern void __ctordtorInit (void);
@@ -20 +22 @@
     {
       inited = 1;
+      __ctordtorInit1 (&__eh_init__);
       __ctordtorInit1 (&__CTOR_LIST__);
     }
@@ -33 +36 @@
       inited = 0;
       __ctordtorTerm1 (&__DTOR_LIST__);
+      __ctordtorTerm1 (&__eh_term__);
     }
 }

trunk/src/gcc/gcc/config/i386/emx-eh.c

@@ -1 @@
-/* This piece of code is linked into the program from gcc.a if any of the
-   object files that are linked together use exception (e.g. have exception
+/* This piece of code is linked into the program from gccXYZ.a or libgcc_eh.a
+   if any of the object files in the link are using exception (i.e. have exception
    frame tables inside). The code automatically registers all exception
    tables into a central list (meant to be placed inside gcc*.dll),
@@ -14 +14 @@
 /**
  * Inits exception handler stuff.
- * Intended external caller is _DLL_InitTerm.
+ * Called by __ctordtorInit() thru the __eh_init__ vector.
  */
-void __attribute__((constructor)) __ehInit (void)
+void __ehInit (void)
 {
   if (!inited)
@@ -28 +28 @@
 /**
  * Terminates exception handler stuff.
- * Intended external caller is _DLL_InitTerm.
+ * Called by __ctordtorTerm() thru the __eh_term__ vector.
  */
-void __attribute__((destructor)) __ehTerm (void)
+void __ehTerm (void)
 {
   if (inited)
@@ -39 +39 @@
     }
 }
+
+/* emx-ctordtor.c will process these. */
+__asm__ (".stabs \"___eh_init__\", 23, 0, 0, ___ehInit");
+__asm__ (".stabs \"___eh_term__\", 23, 0, 0, ___ehTerm");