summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-09-21 17:51:10 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-09-21 17:51:10 +0000
commit6d1356391152de352c319149c406e2b8850679d1 (patch)
tree6519fb0defd2ed38b74d5db51303f3677ebd9b4b
parentd1a791060403b34a5a973b03d90751a155e0ae4e (diff)
downloadrtems-6d1356391152de352c319149c406e2b8850679d1.tar.bz2
2001-09-14 Eric Norum <eric.norum@usask.ca>
* libc/gxx_wrappers.c: Modifications to make gcc 3.x happy.
-rw-r--r--c/src/exec/libcsupport/src/gxx_wrappers.c9
-rw-r--r--c/src/lib/ChangeLog4
-rw-r--r--c/src/lib/libc/gxx_wrappers.c9
-rw-r--r--cpukit/libcsupport/src/gxx_wrappers.c9
4 files changed, 10 insertions, 21 deletions
diff --git a/c/src/exec/libcsupport/src/gxx_wrappers.c b/c/src/exec/libcsupport/src/gxx_wrappers.c
index f5c6f2c92b..f003a85917 100644
--- a/c/src/exec/libcsupport/src/gxx_wrappers.c
+++ b/c/src/exec/libcsupport/src/gxx_wrappers.c
@@ -46,11 +46,6 @@ typedef void *__gthread_mutex_t;
#define DEBUG_GXX_WRAPPERS 1
*/
-
-/* prototype for the terminate() */
-extern void __terminate( void );
-
-
#ifdef DEBUG_GXX_WRAPPERS
/* local function to return the ID of the calling thread */
static rtems_id get_tid( void )
@@ -145,7 +140,7 @@ void *rtems_gxx_getspecific(__gthread_key_t key)
*/
if( rtems_task_variable_add( RTEMS_SELF, (void **)key, NULL ) != RTEMS_SUCCESSFUL )
{
- __terminate ();
+ rtems_panic ("rtems_gxx_getspecific");
}
*( void ** )key = (void *)0;
}
@@ -188,7 +183,7 @@ void rtems_gxx_mutex_init (__gthread_mutex_t *mutex)
0,
(rtems_id *)mutex ) != RTEMS_SUCCESSFUL )
{
- __terminate ();
+ rtems_panic ("rtems_gxx_mutex_init");
}
#ifdef DEBUG_GXX_WRAPPERS
printk( "gxx_wrappers: mutex init complete =%X\n", *mutex );
diff --git a/c/src/lib/ChangeLog b/c/src/lib/ChangeLog
index 0bb2ccb6f5..ab87fbcafb 100644
--- a/c/src/lib/ChangeLog
+++ b/c/src/lib/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-14 Eric Norum <eric.norum@usask.ca>
+
+ * libc/gxx_wrappers.c: Modifications to make gcc 3.x happy.
+
2001-08-17 Joel Sherrill <joel@OARcorp.com>
* include/rtems/libio_.h: Added ifdef to ensure that LOGIN_NAME_MAX
diff --git a/c/src/lib/libc/gxx_wrappers.c b/c/src/lib/libc/gxx_wrappers.c
index f5c6f2c92b..f003a85917 100644
--- a/c/src/lib/libc/gxx_wrappers.c
+++ b/c/src/lib/libc/gxx_wrappers.c
@@ -46,11 +46,6 @@ typedef void *__gthread_mutex_t;
#define DEBUG_GXX_WRAPPERS 1
*/
-
-/* prototype for the terminate() */
-extern void __terminate( void );
-
-
#ifdef DEBUG_GXX_WRAPPERS
/* local function to return the ID of the calling thread */
static rtems_id get_tid( void )
@@ -145,7 +140,7 @@ void *rtems_gxx_getspecific(__gthread_key_t key)
*/
if( rtems_task_variable_add( RTEMS_SELF, (void **)key, NULL ) != RTEMS_SUCCESSFUL )
{
- __terminate ();
+ rtems_panic ("rtems_gxx_getspecific");
}
*( void ** )key = (void *)0;
}
@@ -188,7 +183,7 @@ void rtems_gxx_mutex_init (__gthread_mutex_t *mutex)
0,
(rtems_id *)mutex ) != RTEMS_SUCCESSFUL )
{
- __terminate ();
+ rtems_panic ("rtems_gxx_mutex_init");
}
#ifdef DEBUG_GXX_WRAPPERS
printk( "gxx_wrappers: mutex init complete =%X\n", *mutex );
diff --git a/cpukit/libcsupport/src/gxx_wrappers.c b/cpukit/libcsupport/src/gxx_wrappers.c
index f5c6f2c92b..f003a85917 100644
--- a/cpukit/libcsupport/src/gxx_wrappers.c
+++ b/cpukit/libcsupport/src/gxx_wrappers.c
@@ -46,11 +46,6 @@ typedef void *__gthread_mutex_t;
#define DEBUG_GXX_WRAPPERS 1
*/
-
-/* prototype for the terminate() */
-extern void __terminate( void );
-
-
#ifdef DEBUG_GXX_WRAPPERS
/* local function to return the ID of the calling thread */
static rtems_id get_tid( void )
@@ -145,7 +140,7 @@ void *rtems_gxx_getspecific(__gthread_key_t key)
*/
if( rtems_task_variable_add( RTEMS_SELF, (void **)key, NULL ) != RTEMS_SUCCESSFUL )
{
- __terminate ();
+ rtems_panic ("rtems_gxx_getspecific");
}
*( void ** )key = (void *)0;
}
@@ -188,7 +183,7 @@ void rtems_gxx_mutex_init (__gthread_mutex_t *mutex)
0,
(rtems_id *)mutex ) != RTEMS_SUCCESSFUL )
{
- __terminate ();
+ rtems_panic ("rtems_gxx_mutex_init");
}
#ifdef DEBUG_GXX_WRAPPERS
printk( "gxx_wrappers: mutex init complete =%X\n", *mutex );