From 57f2df1f6222f72504584f92e237640863d30da2 Mon Sep 17 00:00:00 2001
From: pierre <pierre@freepascal.org>
Date: Wed, 27 Apr 2016 13:13:31 +0000
Subject: [PATCH]   * Remove sysutils in _USES clause,  to avoid exception
 handling importation,   especially when exeinfo unit is implicitly loaded
 when -gl compilation option   is used.   + LocalError, new ExitProc
 procedure, used to catch any error that could happen   inside
 GetExeInMemoryBaseAddr procedure.   * Use SetJmp/LongJmp instead of
 Try/except in GetExeInMemoryBaseAddr function,   together with local change
 and restoration of ExitProc.

git-svn-id: trunk@33561 -
---
 rtl/inc/exeinfo.pp | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/rtl/inc/exeinfo.pp b/rtl/inc/exeinfo.pp
index 4729ca27aa..5c105b278a 100644
--- a/rtl/inc/exeinfo.pp
+++ b/rtl/inc/exeinfo.pp
@@ -54,7 +54,7 @@ procedure GetModuleByAddr(addr: pointer; var baseaddr: pointer; var filename: st
 implementation
 
 uses
-  sysutils,strings{$ifdef windows},windows{$endif windows};
+  strings{$ifdef windows},windows{$endif windows};
 
 {$ifdef unix}
 
@@ -806,6 +806,13 @@ type
 var
   envp : ppchar external name 'operatingsystem_parameter_envp';
 {$endif not SOLARIS}
+var
+  LocalJmpBuf : Jmp_Buf;  
+procedure LocalError;
+begin
+  Longjmp(LocalJmpBuf,1);
+end;
+
 procedure GetExeInMemoryBaseAddr(addr : pointer; var BaseAddr : pointer;
                                  var filename : openstring);
 type
@@ -829,10 +836,14 @@ var
   phdr_size : ptruint;
   phdr :  ^telfproghdr;
   found_addr : ptruint;
-
+  SavedExitProc : pointer;
 begin
   filename:=ParamStr(0);
-  Try
+  SavedExitProc:=ExitProc;
+  ExitProc:=@LocalError;
+  if SetJmp(LocalJmpBuf)=0 then
+  begin
+  { Try, avoided in order to remove exception installation }
     pc:=envp;
     phdr_count:=-1;
     phdr_size:=0;
@@ -889,11 +900,14 @@ begin
      else
     writeln(stderr,'Error parsing stack');
   {$endif DEBUG}
-  except
+  end
+  else
+  begin
   {$ifdef DEBUG}
     writeln(stderr,'Exception parsing stack');
   {$endif DEBUG}
-  end
+  end;
+  ExitProc:=SavedExitProc;
 end;
 {$endif FIND_BASEADDR_ELF}