Convert WideStrInits and ResStrInits to indirect symbols.

compiler/ngenutil.pas, tnodeutils:
  * InsertRuntimeInits: also generate an indirect symbol
  * InsertRuntimeInitsTablesTable: use the indirect symbol in the table
rtl/objpas/objpas.pp:
  * UpdateResourceStringRefs: respect the new indirect reference of the table entry
rtl/win/syswin.inc:
  * InitWin32Widestrings: respect the new indirect reference of the table entry

git-svn-id: branches/svenbarth/packages@32638 -

compiler/ngenutil.pas

@@ -852,7 +852,7 @@ implementation
        begin
          if (hp.u.flags and unitflag)=unitflag then
           begin
-            hlist.concat(Tai_const.Createname(make_mangledname(prefix,hp.u.globalsymtable,''),0));
+            hlist.concat(Tai_const.Createname(make_mangledname(prefix,hp.u.globalsymtable,'')+indirect_suffix,0));
             inc(count);
           end;
          hp:=tused_unit(hp.next);
@@ -860,7 +860,7 @@ implementation
       { Add items from program, if any }
       if (current_module.flags and unitflag)=unitflag then
        begin
-         hlist.concat(Tai_const.Createname(make_mangledname(prefix,current_module.localsymtable,''),0));
+         hlist.concat(Tai_const.Createname(make_mangledname(prefix,current_module.localsymtable,'')+indirect_suffix,0));
          inc(count);
        end;
       { Insert TableCount at start }
@@ -879,6 +879,7 @@ implementation
     var
       s: string;
       item: TTCInitItem;
+      labind : tasmsymbol;
     begin
       item:=TTCInitItem(list.First);
       if item=nil then
@@ -902,6 +903,11 @@ implementation
       current_asmdata.asmlists[al_globals].concat(Tai_const.Create_sym(nil));
       current_asmdata.asmlists[al_globals].concat(Tai_symbol_end.Createname(s));
       current_module.flags:=current_module.flags or unitflag;
+      { indirect symbol }
+      labind:=current_asmdata.DefineAsmSymbol(s+indirect_suffix,AB_GLOBAL,AT_DATA);
+      current_asmdata.asmlists[al_globals].concat(Tai_symbol.Create_Global(labind,0));
+      current_asmdata.asmlists[al_globals].concat(Tai_const.Createname(s,AT_DATA,0));
+      current_asmdata.asmlists[al_globals].concat(tai_symbol_end.Create(labind));
     end;
 
 

rtl/objpas/objpas.pp

@@ -328,10 +328,11 @@ Type
      Addr: PPointer;
      Data: PResourceStringRecord;
    end;
+   PPResStrInitEntry = ^PResStrInitEntry;
 
    TResStrInitTable = packed record
      Count: {$ifdef VER2_6}longint{$else}sizeint{$endif};
-     Tables: packed array[1..{$ifdef cpu16}8191{$else cpu16}32767{$endif cpu16}] of PResStrInitEntry;
+     Tables: packed array[1..{$ifdef cpu16}8191{$else cpu16}32767{$endif cpu16}] of {$ifndef ver2_6}PPResStrInitEntry{$else}PResStrInitEntry{$endif};
    end;
    PResStrInitTable = ^TResStrInitTable;
 
@@ -350,7 +351,7 @@ var
 begin
   for i:=1 to ResStrInitTable^.Count do
     begin
-      ptable:=ResStrInitTable^.Tables[i];
+      ptable:=ResStrInitTable^.Tables[i]{$ifndef ver2_6}^{$endif};
       while Assigned(ptable^.Addr) do
         begin
           AnsiString(ptable^.Addr^):=ptable^.Data^.CurrentValue;

rtl/win/syswin.inc

@@ -356,11 +356,12 @@ type
     addr: PPointer;
     data: Pointer;
   end;
+  PPWStrInitEntry = ^PWStrInitEntry;
 
   PWStrInitTablesTable = ^TWStrInitTablesTable;
   TWStrInitTablesTable = packed record
     count  : {$ifdef VER2_6}longint{$else}sizeint{$endif};
-    tables : packed array [1..32767] of PWStrInitEntry;
+    tables : packed array [1..32767] of {$ifndef ver2_6}PPWStrInitEntry{$else}PWStrInitEntry{$endif};
   end;
 
 {$if not(defined(VER2_2) or defined(VER2_4))}
@@ -686,7 +687,7 @@ procedure InitWin32Widestrings;
     { assign initial values to global Widestring typed consts }
     for i:=1 to WStrInitTablesTable^.count do
       begin
-        ptable:=WStrInitTablesTable^.tables[i];
+        ptable:=WStrInitTablesTable^.tables[i]{$ifndef ver2_6}^{$endif};
         while Assigned(ptable^.addr) do
           begin
             fpc_widestr_assign(ptable^.addr^, ptable^.data);