paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-28 22:40:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix phdr pointer increment and use envp variable from system unit for Solaris operating system

Browse Source 
git-svn-id: trunk@33008 -
This commit is contained in:
pierre 2016-01-27 10:47:16 +00:00
parent 90359bcb3c
commit 3de617c79e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rtl/inc/exeinfo.pp
View File

@ -800,9 +800,12 @@ type
{$if defined(ELF32) or defined(ELF64) or defined(BEOS)} {$if defined(ELF32) or defined(ELF64) or defined(BEOS)}
{$ifdef FIND_BASEADDR_ELF} {$ifdef FIND_BASEADDR_ELF}
{$ifndef SOLARIS}
{ Solaris has envp variable in system unit interface,
so we directly use system envp variable in that case }
var var
envp : ppchar external name 'operatingsystem_parameter_envp'; envp : ppchar external name 'operatingsystem_parameter_envp';
{$endif not SOLARIS}
procedure GetExeInMemoryBaseAddr(addr : pointer; var BaseAddr : pointer; procedure GetExeInMemoryBaseAddr(addr : pointer; var BaseAddr : pointer;
var filename : openstring); var filename : openstring);
type type
@ -860,7 +863,7 @@ begin
begin begin
if (phdr^.p_type = 1 {PT_LOAD}) and (ptruint(phdr^.p_vaddr) < found_addr) then if (phdr^.p_type = 1 {PT_LOAD}) and (ptruint(phdr^.p_vaddr) < found_addr) then
found_addr:=phdr^.p_vaddr; found_addr:=phdr^.p_vaddr;
inc(phdr, phdr_size); inc(pointer(phdr), phdr_size);
end; end;
{$ifdef DEBUG} {$ifdef DEBUG}
end end