OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

runtime: Check _end rather than end to find end of program.

Browse Source 
This fixes a problem on Solaris, where end is not defined in
the main program but comes from some shared library.  This
only matters for 32-bit targets.

From-SVN: r201220
This commit is contained in:
Ian Lance Taylor 2013-07-24 17:37:07 +00:00
parent f735ce315f
commit 08d22f9b41
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libgo/runtime/malloc.goc
View File

@ -319,7 +319,7 @@ runtime_mallocinit(void)
{ {
byte *p; byte *p;
uintptr arena_size, bitmap_size; uintptr arena_size, bitmap_size;
extern byte end[]; extern byte _end[];
byte *want; byte *want;
uintptr limit; uintptr limit;
@ -408,7 +408,7 @@ runtime_mallocinit(void)
// So adjust it upward a little bit ourselves: 1/4 MB to get // So adjust it upward a little bit ourselves: 1/4 MB to get
// away from the running binary image and then round up // away from the running binary image and then round up
// to a MB boundary. // to a MB boundary.
want = (byte*)(((uintptr)end + (1<<18) + (1<<20) - 1)&~((1<<20)-1)); want = (byte*)(((uintptr)_end + (1<<18) + (1<<20) - 1)&~((1<<20)-1));
if(0xffffffff - (uintptr)want <= bitmap_size + arena_size) if(0xffffffff - (uintptr)want <= bitmap_size + arena_size)
want = 0; want = 0;
p = runtime_SysReserve(want, bitmap_size + arena_size); p = runtime_SysReserve(want, bitmap_size + arena_size);