From 4e3c5e202a4875e34dc65024eb4d2fced2da7fda Mon Sep 17 00:00:00 2001
From: yury <jura@cp-lab.com>
Date: Sun, 5 Nov 2006 17:13:31 +0000
Subject: [PATCH] * Internal linker sorts only .idata section and removes stabs
 of unused functions. It seems all debug info problems with internal linker
 are solved now. * Properly arrange arm-wince exception sections.

git-svn-id: trunk@5249 -
---
 compiler/ogbase.pas   | 24 +++++++++++++++++++++---
 compiler/pmodules.pas | 20 ++++++++++++--------
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/compiler/ogbase.pas b/compiler/ogbase.pas
index 3ece60e810..c5409f0033 100644
--- a/compiler/ogbase.pas
+++ b/compiler/ogbase.pas
@@ -453,7 +453,7 @@ implementation
 
     uses
       SysUtils,
-      globals,verbose,fmodule,ogmap;
+      globals,verbose,fmodule,ogmap,dbgstabs;
 
     const
       SectionDataMaxGrow = 4096;
@@ -1507,7 +1507,8 @@ implementation
               end;
           end;
         { Sort list if needed }
-        TmpObjSectionList.Sort(@ObjSectionNameCompare);
+        if CurrExeSec.Name='.idata' then
+          TmpObjSectionList.Sort(@ObjSectionNameCompare);
         { Add the (sorted) list to the current ExeSection }
         for i:=0 to TmpObjSectionList.Count-1 do
           begin
@@ -2015,6 +2016,7 @@ implementation
         mergestabcnt,
         stabcnt : longint;
         skipstab : boolean;
+        skipfun : boolean;
         hstab   : TObjStabEntry;
         stabrelocofs : longint;
         buf     : array[0..1023] of byte;
@@ -2041,6 +2043,7 @@ implementation
         buf[0]:=0;
         mergedstabstrsec.write(buf[0],1);
 
+        skipfun:=false;
         { Copy stabs and corresponding Relocations }
         for i:=0 to stabexesec.ObjSectionList.Count-1 do
           begin
@@ -2059,6 +2062,11 @@ implementation
                     { Only include first hdrsym stab }
                     if hstab.ntype=0 then
                       skipstab:=true;
+                    if skipfun then
+                      begin
+                        skipstab:=hstab.ntype in [N_TextLine,N_RSYM,N_LSYM,N_tsym,N_LBRAC,N_RBRAC,N_IncludeFile];
+                        skipfun:=skipstab;
+                      end;
                     if not skipstab then
                       begin
                         { Find corresponding Relocation }
@@ -2088,7 +2096,17 @@ implementation
                             if not assigned(relocsec) then
                               internalerror(200603302);
                             if not relocsec.Used then
-                              skipstab:=true;
+                              begin
+                                skipstab:=true;
+                                if (hstab.ntype=N_Function) and (hstab.strpos<>0) then
+                                  begin
+                                    currstabstrsec.Data.seek(hstab.strpos);
+                                    bufsize:=currstabstrsec.Data.read(buf,sizeof(buf));
+                                    bufend:=indexbyte(buf,bufsize,Ord(':'));
+                                    if (bufend<>-1) and (bufend<bufsize-1) and (buf[bufend+1]=Ord('F')) then
+                                      skipfun:=true;
+                                  end;
+                              end;
                           end;
                       end;
                     if not skipstab then
diff --git a/compiler/pmodules.pas b/compiler/pmodules.pas
index 90db427ad2..a7011365d2 100644
--- a/compiler/pmodules.pas
+++ b/compiler/pmodules.pas
@@ -224,15 +224,19 @@ implementation
 
 {$ifdef arm}
     procedure InsertPData;
+      var
+        prolog: TAsmList;
       begin
-        new_section(current_asmdata.asmlists[al_globals],sec_code,'FPC_EH_PROLOG',sizeof(aint),secorder_begin);
-        current_asmdata.asmlists[al_globals].concat(Tai_const.Createname('_ARM_ExceptionHandler', 0));
-        current_asmdata.asmlists[al_globals].concat(Tai_const.Create_32bit(0));
-        current_asmdata.asmlists[al_globals].concat(Tai_symbol.Createname_global('FPC_EH_CODE_START',AT_DATA,0));
-
-        new_section(current_asmdata.asmlists[al_globals],sec_pdata,'',sizeof(aint));
-        current_asmdata.asmlists[al_globals].concat(Tai_const.Createname('FPC_EH_CODE_START', 0));
-        current_asmdata.asmlists[al_globals].concat(Tai_const.Create_32bit($cfffff02));
+        prolog:=TAsmList.create;
+        new_section(prolog,sec_code,'FPC_EH_PROLOG',sizeof(aint),secorder_begin);
+        prolog.concat(Tai_const.Createname('_ARM_ExceptionHandler', 0));
+        prolog.concat(Tai_const.Create_32bit(0));
+        prolog.concat(Tai_symbol.Createname_global('FPC_EH_CODE_START',AT_DATA,0));
+        current_asmdata.asmlists[al_start].insertList(prolog);
+        prolog.Free;
+        new_section(current_asmdata.asmlists[al_end],sec_pdata,'',sizeof(aint));
+        current_asmdata.asmlists[al_end].concat(Tai_const.Createname('FPC_EH_CODE_START', 0));
+        current_asmdata.asmlists[al_end].concat(Tai_const.Create_32bit($cfffff02));
       end;
 {$endif arm}