# HG changeset patch
# User jlarmour
# Date 1193232346 0
# Node ID b71267f278b63217e0d9e46986e97ce8bd827683
# Parent  40f4042caecaeffb2dfe9017433cdb3b8340f81d
        * src/heapgen.tcl: Init priority for pool initialization is now
        CYG_INIT_MEMALLOC instead of before CYG_INIT_LIBC.

diff --git a/packages/services/memalloc/common/current/ChangeLog b/packages/services/memalloc/common/current/ChangeLog
--- a/packages/services/memalloc/common/current/ChangeLog
+++ b/packages/services/memalloc/common/current/ChangeLog
@@ -1,8 +1,11 @@
 2007-10-24  Oyvind Harboe <oyvind.harboe@zylin.com>
+2007-10-24  Jonathan Larmour  <jifl@eCosCentric.com>
 
 	* src/malloc.cxx: Init priority for pool initialization is now
 	CYG_INIT_MEMALLOC instead of before CYG_INIT_LIBC
 
+	* src/heapgen.tcl: Ditto.
+
 2006-05-17  Andrew Lunn  <andrew.lunn@ascom.ch>
 
 	* doc/memalloc.sgml: Fix parameters for calloc. Reported by
diff --git a/packages/services/memalloc/common/current/src/heapgen.tcl b/packages/services/memalloc/common/current/src/heapgen.tcl
--- a/packages/services/memalloc/common/current/src/heapgen.tcl
+++ b/packages/services/memalloc/common/current/src/heapgen.tcl
@@ -172,7 +172,7 @@ puts $cfile ""
 foreach heap $heaps {
     puts $cfile "#ifdef HAL_MEM_REAL_REGION_TOP\n"
 
-    puts $cfile [ format "%s CYGBLD_ATTRIB_INIT_PRI(CYG_INIT_MEMALLOC) cygmem_pool_%s ( (cyg_uint8 *)CYGMEM_SECTION_%s ," \
+    puts $cfile [ format "%s CYGBLD_ATTRIB_INIT_BEFORE(CYG_INIT_MEMALLOC) cygmem_pool_%s ( (cyg_uint8 *)CYGMEM_SECTION_%s ," \
             $malloc_impl_class $heap $heap ]
     puts $cfile [ format "    HAL_MEM_REAL_REGION_TOP( (cyg_uint8 *)CYGMEM_SECTION_%s + CYGMEM_SECTION_%s_SIZE ) - (cyg_uint8 *)CYGMEM_SECTION_%s ) " \
             $heap $heap $heap ]
@@ -180,7 +180,7 @@ foreach heap $heaps {
 
     puts $cfile "#else\n"
 
-    puts $cfile [ format "%s CYGBLD_ATTRIB_INIT_PRI(CYG_INIT_MEMALLOC) cygmem_pool_%s ( (cyg_uint8 *)CYGMEM_SECTION_%s , CYGMEM_SECTION_%s_SIZE ) ;\n" \
+    puts $cfile [ format "%s CYGBLD_ATTRIB_INIT_BEFORE(CYG_INIT_MEMALLOC) cygmem_pool_%s ( (cyg_uint8 *)CYGMEM_SECTION_%s , CYGMEM_SECTION_%s_SIZE ) ;\n" \
             $malloc_impl_class $heap $heap $heap ]
 
     puts $cfile "#endif"