diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-04-28 18:12:43 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-04-28 18:12:43 +0000 |
| commit | 7cdaed0d00c30de1eaa1accb6c4f71b018bc634b (patch) | |
| tree | bc19ff6fa042e5c958adadda593eec15cfb90b61 /cpukit | |
| parent | Regenerate. (diff) | |
| download | rtems-7cdaed0d00c30de1eaa1accb6c4f71b018bc634b.tar.bz2 | |
2008-04-28 Daron Chabot <daron.chabot@usask.ca>
* posix/src/keycreate.c, posix/src/pthreadequal.c,
rtems/src/semtranslatereturncode.c,
score/cpu/powerpc/rtems/score/powerpc.h,
score/src/threadblockingoperationcancel.c: Fix compilation errors
when --enable-rtems-debug is used.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 8 | ||||
| -rw-r--r-- | cpukit/posix/src/keycreate.c | 2 | ||||
| -rw-r--r-- | cpukit/posix/src/pthreadequal.c | 2 | ||||
| -rw-r--r-- | cpukit/rtems/src/semtranslatereturncode.c | 2 | ||||
| -rw-r--r-- | cpukit/score/cpu/powerpc/rtems/score/powerpc.h | 5 | ||||
| -rw-r--r-- | cpukit/score/src/threadblockingoperationcancel.c | 3 |
6 files changed, 19 insertions, 3 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 168dc7676f..850854e536 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,11 @@ +2008-04-28 Daron Chabot <daron.chabot@usask.ca> + + * posix/src/keycreate.c, posix/src/pthreadequal.c, + rtems/src/semtranslatereturncode.c, + score/cpu/powerpc/rtems/score/powerpc.h, + score/src/threadblockingoperationcancel.c: Fix compilation errors + when --enable-rtems-debug is used. + 2008-04-25 Joel Sherrill <joel.sherrill@OARcorp.com> * score/include/rtems/system.h: Fix typo in comment. diff --git a/cpukit/posix/src/keycreate.c b/cpukit/posix/src/keycreate.c index b54a25812a..df5cec3241 100644 --- a/cpukit/posix/src/keycreate.c +++ b/cpukit/posix/src/keycreate.c @@ -70,7 +70,7 @@ int pthread_key_create( _Internal_error_Occurred( INTERNAL_ERROR_CORE, TRUE, - INTERNAL_ERROR_IMPLEMENTATION + INTERNAL_ERROR_IMPLEMENTATION_KEY_CREATE_INCONSISTENCY ); #endif bytes_to_allocate = sizeof( void * ) * diff --git a/cpukit/posix/src/pthreadequal.c b/cpukit/posix/src/pthreadequal.c index 8d82d8d545..5fbe0c4f5e 100644 --- a/cpukit/posix/src/pthreadequal.c +++ b/cpukit/posix/src/pthreadequal.c @@ -70,7 +70,9 @@ int pthread_equal( break; case OBJECTS_ERROR: +#if defined(RTEMS_MULTIPROCESSING) case OBJECTS_REMOTE: +#endif /* t1 must have been valid so exit the critical section */ _Thread_Enable_dispatch(); /* return status == 0 */ diff --git a/cpukit/rtems/src/semtranslatereturncode.c b/cpukit/rtems/src/semtranslatereturncode.c index 98dec89bdf..1315952f33 100644 --- a/cpukit/rtems/src/semtranslatereturncode.c +++ b/cpukit/rtems/src/semtranslatereturncode.c @@ -130,7 +130,7 @@ rtems_status_code _Semaphore_Translate_core_semaphore_return_code ( * Internal consistency check for bad status from SuperCore */ #if defined(RTEMS_DEBUG) - if ( the_semaphore_status > CORE_SEMAPHORE_STATUS_LAST ) + if ( status > CORE_SEMAPHORE_STATUS_LAST ) return RTEMS_INTERNAL_ERROR; #endif return _Semaphore_Translate_core_semaphore_return_code_[status]; diff --git a/cpukit/score/cpu/powerpc/rtems/score/powerpc.h b/cpukit/score/cpu/powerpc/rtems/score/powerpc.h index 29a2a2a70d..fb7dd139b3 100644 --- a/cpukit/score/cpu/powerpc/rtems/score/powerpc.h +++ b/cpukit/score/cpu/powerpc/rtems/score/powerpc.h @@ -74,6 +74,11 @@ extern "C" { * - 0 otherwise */ +/* JRS: XXX treat this as generic until cleaned up */ +#if defined(ppc8540) +#define __ppc_generic +#endif + /* * Figure out all CPU Model Feature Flags based upon compiler * predefines. diff --git a/cpukit/score/src/threadblockingoperationcancel.c b/cpukit/score/src/threadblockingoperationcancel.c index 82366af144..56db344bd4 100644 --- a/cpukit/score/src/threadblockingoperationcancel.c +++ b/cpukit/score/src/threadblockingoperationcancel.c @@ -43,7 +43,8 @@ void _Thread_blocking_operation_Cancel( */ #if defined(RTEMS_DEBUG) - if ( (sync_state == THREAD_BLOCKING_OPERATION_SYNCHRONIZED) + #include <rtems/score/interr.h> + if ( (sync_state == THREAD_BLOCKING_OPERATION_SYNCHRONIZED) || (sync_state == THREAD_BLOCKING_OPERATION_NOTHING_HAPPENED) ) { _Internal_error_Occurred( INTERNAL_ERROR_CORE, |