diff options
author | giulio <giulio@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2008-05-15 15:46:00 +0000 |
---|---|---|
committer | giulio <giulio@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2008-05-15 15:46:00 +0000 |
commit | d671802e42267e08155140cdbe6dfb517a2ed8f6 (patch) | |
tree | ab62e6cb04d13a834dac1df514bf8bacf7d64699 | |
parent | 4389706863ca7e8ab0a8604bf88877823614a4a1 (diff) | |
download | fpc-d671802e42267e08155140cdbe6dfb517a2ed8f6.tar.gz |
Merged revisions 10967 via svnmerge from
http://svn.freepascal.org/svn/fpc/trunk
........
r10967 | giulio | 2008-05-14 15:08:11 +0200 (mer, 14 mag 2008) | 2 lines
Checkpointer: consider bss section too for go32v2 (webtbs/tw3661 now works)
........
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_2_2@10975 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r-- | rtl/inc/heaptrc.pp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/rtl/inc/heaptrc.pp b/rtl/inc/heaptrc.pp index 946769a911..795fa7a562 100644 --- a/rtl/inc/heaptrc.pp +++ b/rtl/inc/heaptrc.pp @@ -792,7 +792,7 @@ end; var __stklen : longword;external name '__stklen'; __stkbottom : longword;external name '__stkbottom'; - edata : longword; external name 'edata'; + ebss : longword; external name 'end'; {$endif go32v2} {$ifdef linux} @@ -835,7 +835,7 @@ var pp : pheap_mem_info; {$ifdef go32v2} get_ebp,stack_top : longword; - data_end : longword; + bss_end : longword; {$endif go32v2} {$ifdef morphos} stack_top: longword; @@ -859,12 +859,12 @@ begin runerror(216); asm movl %ebp,get_ebp - leal edata,%eax - movl %eax,data_end + leal ebss,%eax + movl %eax,bss_end end; stack_top:=__stkbottom+__stklen; - { allow all between start of code and end of data } - if ptruint(p)<=data_end then + { allow all between start of code and end of bss } + if ptruint(p)<=bss_end then goto _exit; { stack can be above heap !! } |