change log for rtems (2011-07-01)

[rtems-vc at rtems.org]

 *joel*:
2011-07-01	Joel Sherrill <joel.sherrill at 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.

M 1.2865  cpukit/ChangeLog
M   1.15  cpukit/libcsupport/src/malloc_initialize.c

diff -u rtems/cpukit/ChangeLog:1.2864 rtems/cpukit/ChangeLog:1.2865
--- rtems/cpukit/ChangeLog:1.2864	Tue Jun 28 15:39:39 2011
+++ rtems/cpukit/ChangeLog	Fri Jul  1 13:23:08 2011
@@ -1,3 +1,10 @@
+2011-07-01	Joel Sherrill <joel.sherrill at 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 at oarcorp.com>
 
 	PR 1826/cpukit

diff -u rtems/cpukit/libcsupport/src/malloc_initialize.c:1.14 rtems/cpukit/libcsupport/src/malloc_initialize.c:1.15
--- rtems/cpukit/libcsupport/src/malloc_initialize.c:1.14	Wed Aug 25 09:30:01 2010
+++ rtems/cpukit/libcsupport/src/malloc_initialize.c	Fri Jul  1 13:23:09 2011
@@ -45,7 +45,7 @@
 {
   /*
    *  If configured, initialize the statistics support
-  */
+   */
   if ( rtems_malloc_statistics_helpers != NULL ) {
     (*rtems_malloc_statistics_helpers->initialize)();
   }
@@ -59,11 +59,13 @@
    *  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;
   }
 
   /*



--

Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20110701/a4e3a427/attachment.html>