Changeset 94ab166 in rtems

Timestamp:

11/20/01 18:22:35 (21 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

904e185

Parents:

82a48d0

Message:

2001-11-20 Joel Sherrill <joel@…>

• src/threadhandler.c: When USEMAIN is defined by the toolset, invoke the global constructors via main. Reported as tested by Alexandra Kossovsky <sasha@…> and Victor V. Vengerov <vvv@…> in conjunction with a new set of tool RPMs (gcc2.95.3newlib1.9.0-3). This was tracked as GNATS PR tools/84.

Files:

• c/src/exec/score/ChangeLog (modified) (1 diff)
• c/src/exec/score/src/threadhandler.c (modified) (3 diffs)
• cpukit/score/ChangeLog (modified) (1 diff)
• cpukit/score/src/threadhandler.c (modified) (3 diffs)

c/src/exec/score/ChangeLog

@@ +1 @@
+2001-11-20      Joel Sherrill <joel@OARcorp.com>
+
+        * src/threadhandler.c: When __USE__MAIN__ is defined by the toolset,
+        invoke the global constructors via __main.  Reported as tested by 
+        Alexandra Kossovsky <sasha@oktet.ru> and  Victor V. Vengerov
+        <vvv@oktet.ru> in conjunction with a new set of tool RPMs
+        (gcc2.95.3newlib1.9.0-3).  This was tracked as GNATS PR tools/84.
+
 2001-11-07      Joel Sherrill <joel@OARcorp.com>
 

c/src/exec/score/src/threadhandler.c

@@ -59 +59 @@
   ISR_Level  level;
   Thread_Control *executing;
-#if defined(__USE_INIT_FINI__)
+#if defined(__USE_INIT_FINI__) || defined(__USE__MAIN__)
   static char doneConstructors;
   char doneCons;
@@ -74 +74 @@
   _ISR_Set_level(level);
 
-#if defined(__USE_INIT_FINI__)
+#if defined(__USE_INIT_FINI__) || defined(__USE__MAIN__)
   doneCons = doneConstructors;
   doneConstructors = 1;
@@ -96 +96 @@
     _init ();
 #endif
+#if defined(__USE__MAIN__)
+  if (!doneCons)
+    __main ();
+#endif
+
  
   switch ( executing->Start.prototype ) {

cpukit/score/ChangeLog

@@ +1 @@
+2001-11-20      Joel Sherrill <joel@OARcorp.com>
+
+        * src/threadhandler.c: When __USE__MAIN__ is defined by the toolset,
+        invoke the global constructors via __main.  Reported as tested by 
+        Alexandra Kossovsky <sasha@oktet.ru> and  Victor V. Vengerov
+        <vvv@oktet.ru> in conjunction with a new set of tool RPMs
+        (gcc2.95.3newlib1.9.0-3).  This was tracked as GNATS PR tools/84.
+
 2001-11-07      Joel Sherrill <joel@OARcorp.com>
 

cpukit/score/src/threadhandler.c

@@ -59 +59 @@
   ISR_Level  level;
   Thread_Control *executing;
-#if defined(__USE_INIT_FINI__)
+#if defined(__USE_INIT_FINI__) || defined(__USE__MAIN__)
   static char doneConstructors;
   char doneCons;
@@ -74 +74 @@
   _ISR_Set_level(level);
 
-#if defined(__USE_INIT_FINI__)
+#if defined(__USE_INIT_FINI__) || defined(__USE__MAIN__)
   doneCons = doneConstructors;
   doneConstructors = 1;
@@ -96 +96 @@
     _init ();
 #endif
+#if defined(__USE__MAIN__)
+  if (!doneCons)
+    __main ();
+#endif
+
  
   switch ( executing->Start.prototype ) {