Changeset 7d647c0 in rtems


Ignore:
Timestamp:
Jul 1, 2011, 6:23:09 PM (8 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.11, master
Children:
acb92e3
Parents:
d504e48
Message:

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

  • 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.
Location:
cpukit
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    rd504e48 r7d647c0  
     12011-07-01      Joel Sherrill <joel.sherrill@oarcorp.com>
     2
     3        * libcsupport/src/malloc_initialize.c: After discussion with Till
     4        Straumann, revert the change from r1.12 to r1.13. This broke BSPs
     5        with sbrk() support once the libbsp sbrk() framework was enhanced.
     6        psim runs now.
     7
    182011-06-28      Joel Sherrill <joel.sherrill@oarcorp.com>
    29
  • cpukit/libcsupport/src/malloc_initialize.c

    rd504e48 r7d647c0  
    4646  /*
    4747   *  If configured, initialize the statistics support
    48   */
     48   */
    4949  if ( rtems_malloc_statistics_helpers != NULL ) {
    5050    (*rtems_malloc_statistics_helpers->initialize)();
     
    6060   */
    6161  if ( rtems_malloc_sbrk_helpers != NULL ) {
    62     heap_begin = (*rtems_malloc_sbrk_helpers->initialize)(
     62    void *new_heap_begin = (*rtems_malloc_sbrk_helpers->initialize)(
    6363      heap_begin,
    6464      sbrk_amount
    6565    );
    66     heap_size  = (uintptr_t) sbrk_amount;
     66
     67    heap_size -= (uintptr_t) new_heap_begin - (uintptr_t) heap_begin;
     68    heap_begin = new_heap_begin;
    6769  }
    6870
Note: See TracChangeset for help on using the changeset viewer.