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

2011-07-01 Joel Sherrill <joel.sherrill@oarcorp.com>

Browse Source 
* libcsupport/src/malloc_initialize.c: After discussion with Till
	Straumann, revert the change from r1.12 to r1.13. This broke BSPs
	with sbrk() support once the libbsp sbrk() framework was enhanced.
	psim runs now.
This commit is contained in:
Joel Sherrill
2011-07-01 18:23:09 +00:00
parent d504e48b29
commit 7d647c09e9
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cpukit/ChangeLog
View File

@@ -1,3 +1,10 @@
2011-07-01 Joel Sherrill <joel.sherrill@oarcorp.com>
* libcsupport/src/malloc_initialize.c: After discussion with Till
Straumann, revert the change from r1.12 to r1.13. This broke BSPs
with sbrk() support once the libbsp sbrk() framework was enhanced.
psim runs now.
2011-06-28 Joel Sherrill <joel.sherrill@oarcorp.com>
PR 1826/cpukit

8
cpukit/libcsupport/src/malloc_initialize.c
View File

@@ -45,7 +45,7 @@ void RTEMS_Malloc_Initialize(
{
/*
* If configured, initialize the statistics support
*/
*/
if ( rtems_malloc_statistics_helpers != NULL ) {
(*rtems_malloc_statistics_helpers->initialize)();
}
@@ -59,11 +59,13 @@ void RTEMS_Malloc_Initialize(
* Initialize the optional sbrk support for extending the heap
*/
if ( rtems_malloc_sbrk_helpers != NULL ) {
heap_begin = (*rtems_malloc_sbrk_helpers->initialize)(
void *new_heap_begin = (*rtems_malloc_sbrk_helpers->initialize)(
heap_begin,
sbrk_amount
);
heap_size = (uintptr_t) sbrk_amount;
heap_size -= (uintptr_t) new_heap_begin - (uintptr_t) heap_begin;
heap_begin = new_heap_begin;
}
/*