<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for rtems (2011-07-01)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>joel</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>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.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2864&r2=text&tr2=1.2865&diff_format=h">M</a></td><td width='1%'>1.2865</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libcsupport/src/malloc_initialize.c.diff?r1=text&tr1=1.14&r2=text&tr2=1.15&diff_format=h">M</a></td><td width='1%'>1.15</td><td width='100%'>cpukit/libcsupport/src/malloc_initialize.c</td></tr>
</table>
<pre>
<font color='#006600'>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
</font><font color='#997700'>@@ -1,3 +1,10 @@
</font><font color='#000088'>+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.
+
</font> 2011-06-28 Joel Sherrill <joel.sherrill@oarcorp.com>
PR 1826/cpukit
<font color='#006600'>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
</font><font color='#997700'>@@ -45,7 +45,7 @@
</font> {
/*
* If configured, initialize the statistics support
<font color='#880000'>- */
</font><font color='#000088'>+ */
</font> if ( rtems_malloc_statistics_helpers != NULL ) {
(*rtems_malloc_statistics_helpers->initialize)();
}
<font color='#997700'>@@ -59,11 +59,13 @@
</font> * Initialize the optional sbrk support for extending the heap
*/
if ( rtems_malloc_sbrk_helpers != NULL ) {
<font color='#880000'>- heap_begin = (*rtems_malloc_sbrk_helpers->initialize)(
</font><font color='#000088'>+ void *new_heap_begin = (*rtems_malloc_sbrk_helpers->initialize)(
</font> heap_begin,
sbrk_amount
);
<font color='#880000'>- heap_size = (uintptr_t) sbrk_amount;
</font><font color='#000088'>+
+ heap_size -= (uintptr_t) new_heap_begin - (uintptr_t) heap_begin;
+ heap_begin = new_heap_begin;
</font> }
/*
</pre>
<p> </p>
<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>