summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2008-11-05 21:50:11 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2008-11-05 21:50:11 +0000
commitd10477877d2144b0a3d02a11a3a6fc8c9f22422d (patch)
treec4b75ec428e541831fabe51ef2780c51343ed032 /cpukit
parent2008-11-05 Joel Sherrill <joel.sherrill@oarcorp.com> (diff)
downloadrtems-d10477877d2144b0a3d02a11a3a6fc8c9f22422d.tar.bz2
2008-11-05 Joel Sherrill <joel.sherrill@oarcorp.com>
* score/src/threadhandler.c: M32R uses different name for init.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/ChangeLog4
-rw-r--r--cpukit/score/src/threadhandler.c10
2 files changed, 12 insertions, 2 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 551c595bfc..d3107a8ceb 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,9 @@
2008-11-05 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * score/src/threadhandler.c: M32R uses different name for init.
+
+2008-11-05 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* posix/Makefile.am: Add _execve() so we can use newlib posix support
directory and eliminate code in RTEMS.
* posix/src/_execve.c: New file.
diff --git a/cpukit/score/src/threadhandler.c b/cpukit/score/src/threadhandler.c
index 22c9f141cc..cc46f9801a 100644
--- a/cpukit/score/src/threadhandler.c
+++ b/cpukit/score/src/threadhandler.c
@@ -35,7 +35,13 @@
#endif
#if defined(__USE_INIT_FINI__)
- extern void _init(void);
+ #if defined(__M32R__)
+ #define INIT_NAME __init
+ #else
+ #define INIT_NAME _init
+ #endif
+
+ extern void INIT_NAME(void);
#endif
#if defined(__USE__MAIN__)
extern void _main(void);
@@ -131,7 +137,7 @@ void _Thread_Handler( void )
*/
if (!doneCons) /* && (volatile void *)_init) */
{
- _init ();
+ INIT_NAME ();
}
#endif
#if defined(__USE__MAIN__)