Merged revisions 8673,8878,8905 via svnmerge from

svn+ssh://[email protected]/FPC/svn/fpc/trunk

........
r8673 | jonas | 2007-09-29 00:48:41 +0200 (Sat, 29 Sep 2007) | 4 lines

  * fixed and enabled smartlinking on Darwin by adding more .reference
    statements (some to work around linker bugs, most because they were
    really missing)

........
r8878 | jonas | 2007-10-21 13:39:52 +0200 (Sun, 21 Oct 2007) | 2 lines

  * fixed placement of "size" stab for Darwin

........
r8905 | jonas | 2007-10-21 23:19:48 +0200 (Sun, 21 Oct 2007) | 5 lines

  * restored outputting the stabs for local variables and parameters
    which was accidentally disabled in r8878
  * move "end of function" stab past all stabs for the function (except
    for the Darwin "size" stab), like gcc does

........

git-svn-id: branches/fixes_2_2@8950 -

compiler/aggas.pas

@@ -1065,13 +1065,9 @@ implementation
           AsmWriteLn(target_asm.comment+'End asmlist '+AsmlistTypeStr[hal]);
         end;
 
-{
-      Result doesn't work properly yet due to a bug in Apple's linker
-
       if (cs_create_smart in current_settings.moduleswitches) and
          (target_info.system in systems_darwin) then
         AsmWriteLn(#9'.subsections_via_symbols');
-}
 
       AsmLn;
 {$ifdef EXTDEBUG}

compiler/cresstr.pas

@@ -215,10 +215,13 @@ uses
         new_section(current_asmdata.asmlists[al_resourcestrings],sec_data,make_mangledname('RESSTR',current_module.localsymtable,'3_END'),sizeof(aint));
         current_asmdata.AsmLists[al_resourcestrings].concat(tai_symbol.createname_global(
           make_mangledname('RESSTR',current_module.localsymtable,'END'),AT_DATA,0));
-        { the darwin/ppc64 assembler or linker seems to have trouble       }
+        { The darwin/ppc64 assembler or linker seems to have trouble       }
         { if a section ends with a global label without any data after it. }
         { So for safety, just put a dummy value here.                      }
-        if (target_info.system = system_powerpc64_darwin) then   
+        { Further, the regular linker also kills this symbol when turning  }
+        { on smart linking in case no value appears after it, so put the   }
+        { dummy byte there always                                          }
+        if (target_info.system in systems_darwin) then   
           current_asmdata.asmlists[al_resourcestrings].concat(Tai_const.create_8bit(0));
       end;
 

compiler/dbgstabs.pas

@@ -1037,8 +1037,6 @@ implementation
 
             { end of procedure }
             current_asmdata.getlabel(stabsendlabel,alt_dbgtype);
-            templist.concat(tai_label.create(stabsendlabel));
-            current_asmdata.asmlists[al_procedures].insertlistbefore(pd.procendtai,templist);
 
             if assigned(pd.funcretsym) and
                (tabstractnormalvarsym(pd.funcretsym).refs>0) then
@@ -1084,6 +1082,22 @@ implementation
             move(p^,p1^,strlen(p)+1);
             templist.concat(Tai_stab.Create(stab_stabn,p1));
             freemem(p,2*mangled_length+50);
+
+            { the stabsendlabel must come after all other stabs for this }
+            { function                                                   }
+            templist.concat(tai_label.create(stabsendlabel));
+
+            { Add a "size" stab as described in the last paragraph of 2.5 at  }
+            { http://sourceware.org/gdb/current/onlinedocs/stabs_2.html#SEC12 }
+            { This works at least on Darwin (and is needed on Darwin to get   }
+            { correct smartlinking of stabs), but I don't know which binutils }
+            { version is required on other platforms                          }
+            { This stab must come after all other stabs for the procedure,    }
+            { including the LBRAC/RBRAC ones                                  }
+            if (target_info.system in systems_darwin) then
+              templist.concat(Tai_stab.create(stab_stabs,
+                strpnew('"",'+tostr(N_FUNCTION)+',0,0,'+stabsendlabel.name+'-'+pd.mangledname)));
+
             current_asmdata.asmlists[al_procedures].insertlistafter(pd.procendtai,templist);
 
             { "The stab representing a procedure is located immediately
@@ -1110,13 +1124,8 @@ implementation
             if assigned(pd.localst) and
                (pd.localst.symtabletype=localsymtable) then
               write_symtable_syms(templist,pd.localst);
-            { add a "size" stab as described in the last paragraph of 2.5 at  }
-            { http://sourceware.org/gdb/current/onlinedocs/stabs_2.html#SEC12 }
-//            templist.concat(Tai_stab.create(stab_stabs,
-//              strpnew('"",'+tostr(N_FUNCTION)+',0,0,'+stabsendlabel.name+'-'+pd.mangledname)));
 
-            { after the endtai, because the ".size" must come before it }
-            current_asmdata.asmlists[al_procedures].insertlistafter(pd.procendtai,templist);
+            current_asmdata.asmlists[al_procedures].insertlistbefore(pd.procstarttai,templist);
 
             templist.free;
           end;

compiler/ncgcon.pas

@@ -267,7 +267,7 @@ implementation
     procedure tcgstringconstnode.pass_generate_code;
       var
          hp1,hp2 : tai;
-         l1,l2,
+         l1,
          lastlabel   : tasmlabel;
          lastlabelhp : tai;
          pc       : pchar;
@@ -429,19 +429,21 @@ implementation
                            else
                              begin
                                 current_asmdata.getdatalabel(l1);
-                                current_asmdata.getdatalabel(l2);
-                                current_asmdata.asmlists[al_typedconsts].concat(Tai_label.Create(l2));
                                 current_asmdata.asmlists[al_typedconsts].concat(Tai_const.Create_sym(l1));
                                 current_asmdata.asmlists[al_typedconsts].concat(Tai_const.Create_aint(-1));
                                 current_asmdata.asmlists[al_typedconsts].concat(Tai_const.Create_aint(len));
+                                { make sure the string doesn't get dead stripped if the header is referenced }
+                                if (target_info.system in systems_darwin) then
+                                  current_asmdata.asmlists[al_typedconsts].concat(tai_directive.create(asd_reference,l1.name));
                                 current_asmdata.asmlists[al_typedconsts].concat(Tai_label.Create(l1));
+                                { ... and vice versa }
+                                if (target_info.system in systems_darwin) then
+                                  current_asmdata.asmlists[al_typedconsts].concat(tai_directive.create(asd_reference,lab_str.name));
                                 { include also terminating zero }
                                 getmem(pc,len+1);
                                 move(value_str^,pc^,len);
                                 pc[len]:=#0;
                                 current_asmdata.asmlists[al_typedconsts].concat(Tai_string.Create_pchar(pc,len+1));
-                                { return the offset of the real string }
-                                lab_str:=l2;
                              end;
                         end;
                       cst_widestring:
@@ -452,8 +454,6 @@ implementation
                            else
                              begin
                                 current_asmdata.getdatalabel(l1);
-                                current_asmdata.getdatalabel(l2);
-                                current_asmdata.asmlists[al_typedconsts].concat(Tai_label.Create(l2));
                                 current_asmdata.asmlists[al_typedconsts].concat(Tai_const.Create_sym(l1));
 
                                 { we use always UTF-16 coding for constants }
@@ -466,13 +466,17 @@ implementation
                                     current_asmdata.asmlists[al_typedconsts].concat(Tai_const.Create_aint(-1));
                                     current_asmdata.asmlists[al_typedconsts].concat(Tai_const.Create_aint(len*cwidechartype.size));
                                   end;
+                                { make sure the string doesn't get dead stripped if the header is referenced }
+                                if (target_info.system in systems_darwin) then
+                                  current_asmdata.asmlists[al_typedconsts].concat(tai_directive.create(asd_reference,l1.name));
                                 current_asmdata.asmlists[al_typedconsts].concat(Tai_label.Create(l1));
+                                { ... and vice versa }
+                                if (target_info.system in systems_darwin) then
+                                  current_asmdata.asmlists[al_typedconsts].concat(tai_directive.create(asd_reference,lab_str.name));
                                 for i:=0 to len-1 do
                                   current_asmdata.asmlists[al_typedconsts].concat(Tai_const.Create_16bit(pcompilerwidestring(value_str)^.data[i]));
                                 { terminating zero }
                                 current_asmdata.asmlists[al_typedconsts].concat(Tai_const.Create_16bit(0));
-                                { return the offset of the real string }
-                                lab_str:=l2;
                              end;
                         end;
                       cst_shortstring:

compiler/ncgutil.pas

@@ -1975,18 +1975,31 @@ implementation
 
     procedure gen_proc_symbol(list:TAsmList);
       var
-        item : TCmdStrListItem;
+        item,
+        previtem : TCmdStrListItem;
       begin
+        previtem:=nil;
         item := TCmdStrListItem(current_procinfo.procdef.aliasnames.first);
         while assigned(item) do
           begin
+            { "double link" all procedure entry symbols via .reference }
+            { directives on darwin, because otherwise the linker       }
+            { sometimes strips the procedure if only on of the symbols }
+            { is referenced                                            }
+            if assigned(previtem) and
+               (target_info.system in systems_darwin) then
+              list.concat(tai_directive.create(asd_reference,item.str));
             if (cs_profile in current_settings.moduleswitches) or
               (po_global in current_procinfo.procdef.procoptions) then
               list.concat(Tai_symbol.createname_global(item.str,AT_FUNCTION,0))
             else
               list.concat(Tai_symbol.createname(item.str,AT_FUNCTION,0));
+            if assigned(previtem) and
+               (target_info.system in systems_darwin) then
+              list.concat(tai_directive.create(asd_reference,previtem.str));
             if tf_use_function_relative_addresses in target_info.flags then
               list.concat(Tai_function_name.create(item.str));
+            previtem:=item;
             item := TCmdStrListItem(item.next);
           end;
 

compiler/ptconst.pas

@@ -621,7 +621,7 @@ implementation
           strlength : aint;
           strval    : pchar;
           strch     : char;
-          ll        : tasmlabel;
+          ll,ll2    : tasmlabel;
           ca        : pchar;
         begin
           n:=comp_expr(true);
@@ -689,10 +689,18 @@ implementation
                        begin
                          current_asmdata.getdatalabel(ll);
                          list.concat(Tai_const.Create_sym(ll));
+                         current_asmdata.getdatalabel(ll2);
                          current_asmdata.asmlists[al_const].concat(tai_align.create(const_align(sizeof(aint))));
+                         current_asmdata.asmlists[al_const].concat(Tai_label.Create(ll2));
                          current_asmdata.asmlists[al_const].concat(Tai_const.Create_aint(-1));
                          current_asmdata.asmlists[al_const].concat(Tai_const.Create_aint(strlength));
+                         { make sure the string doesn't get dead stripped if the header is referenced }
+                         if (target_info.system in systems_darwin) then
+                           current_asmdata.asmlists[al_typedconsts].concat(tai_directive.create(asd_reference,ll.name));
                          current_asmdata.asmlists[al_const].concat(Tai_label.Create(ll));
+                         { ... and vice versa }
+                         if (target_info.system in systems_darwin) then
+                           list.concat(tai_directive.create(asd_reference,ll2.name));
                          getmem(ca,strlength+1);
                          move(strval^,ca^,strlength);
                          { The terminating #0 to be stored in the .data section (JM) }
@@ -709,7 +717,9 @@ implementation
                        begin
                          current_asmdata.getdatalabel(ll);
                          list.concat(Tai_const.Create_sym(ll));
+                         current_asmdata.getdatalabel(ll2);
                          current_asmdata.asmlists[al_const].concat(tai_align.create(const_align(sizeof(aint))));
+                         current_asmdata.asmlists[al_const].concat(Tai_label.Create(ll2));
                          if tf_winlikewidestring in target_info.flags then
                            current_asmdata.asmlists[al_const].concat(Tai_const.Create_32bit(strlength*cwidechartype.size))
                          else
@@ -717,7 +727,13 @@ implementation
                              current_asmdata.asmlists[al_const].concat(Tai_const.Create_aint(-1));
                              current_asmdata.asmlists[al_const].concat(Tai_const.Create_aint(strlength*cwidechartype.size));
                            end;
+                         { make sure the string doesn't get dead stripped if the header is referenced }
+                         if (target_info.system in systems_darwin) then
+                           current_asmdata.asmlists[al_typedconsts].concat(tai_directive.create(asd_reference,ll.name));
                          current_asmdata.asmlists[al_const].concat(Tai_label.Create(ll));
+                         { ... and vice versa }
+                         if (target_info.system in systems_darwin) then
+                           current_asmdata.asmlists[al_typedconsts].concat(tai_directive.create(asd_reference,ll2.name));
                          for i:=0 to strlength-1 do
                            current_asmdata.asmlists[al_const].concat(Tai_const.Create_16bit(pcompilerwidestring(strval)^.data[i]));
                          { ending #0 }