RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2008-04-28 Daron Chabot <daron.chabot@usask.ca>

Browse Source 
* 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.
This commit is contained in:
Joel Sherrill
2008-04-28 18:12:43 +00:00
parent ea7a607dfb
commit 7cdaed0d00
6 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cpukit/ChangeLog
View File

@@ -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.

2
cpukit/posix/src/keycreate.c
View File

@@ -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 * ) *

2
cpukit/posix/src/pthreadequal.c
View File

@@ -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 */

2
cpukit/rtems/src/semtranslatereturncode.c
View File

@@ -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];

5
cpukit/score/cpu/powerpc/rtems/score/powerpc.h
View File

@@ -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.

3
cpukit/score/src/threadblockingoperationcancel.c
View File

@@ -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,