diff --git a/rtl/inc/systemh.inc b/rtl/inc/systemh.inc index 6a7119e2d1..b056b973fb 100644 --- a/rtl/inc/systemh.inc +++ b/rtl/inc/systemh.inc @@ -604,6 +604,12 @@ type TEntryInformation = record InitFinalTable : Pointer; ThreadvarTablesTable : Pointer; + ResourceStringTables : Pointer; + ResStrInitTables : Pointer; + {$ifndef FPC_WIDESTRING_EQUAL_UNICODESTRING} + WideInitTables : Pointer; + {$endif FPC_WIDESTRING_EQUAL_UNICODESTRING} + ResLocation : Pointer; PascalMain : Procedure; valgrind_used : boolean; {$ifdef HAS_ENTRYINFORMATION_OS} diff --git a/rtl/java/jsystemh_types.inc b/rtl/java/jsystemh_types.inc index 77b7b9e60f..e5bf3fe7d1 100644 --- a/rtl/java/jsystemh_types.inc +++ b/rtl/java/jsystemh_types.inc @@ -540,6 +540,12 @@ type TEntryInformation = record InitFinalTable : Pointer; ThreadvarTablesTable : Pointer; + ResourceStringTables : Pointer; + ResStrInitTables : Pointer; + {$ifndef FPC_WIDESTRING_EQUAL_UNICODESTRING} + WideInitTables : Pointer; + {$endif FPC_WIDESTRING_EQUAL_UNICODESTRING} + ResLocation : Pointer; PascalMain : Procedure; valgrind_used : boolean; {$ifdef HAS_ENTRYINFORMATION_OS} diff --git a/rtl/win32/sysinit.inc b/rtl/win32/sysinit.inc index df8e886a1d..e304bce3a1 100644 --- a/rtl/win32/sysinit.inc +++ b/rtl/win32/sysinit.inc @@ -19,6 +19,11 @@ InitFinalTable : record end; external name 'INITFINAL'; ThreadvarTablesTable : record end; external name 'FPC_THREADVARTABLES'; + WideInitTables : record end; external name 'FPC_WIDEINITTABLES'; + {$ifdef FPC_HAS_RESSTRINITS} + ResStrInitTables : record end; external name 'FPC_RESSTRINITTABLES'; + {$endif FPC_HAS_RESSTRINITS} + ResourceStringTables : record end; external name 'FPC_RESOURCESTRINGTABLES'; valgrind_used : boolean;external name '__fpc_valgrind'; {$if defined(FPC_USE_TLS_DIRECTORY) or defined(FPC_SECTION_THREADVARS)} @@ -48,6 +53,14 @@ SysInitEntryInformation : TEntryInformation = ( InitFinalTable : @InitFinalTable; ThreadvarTablesTable : @ThreadvarTablesTable; + ResourceStringTables : @ResourceStringTables; +{$ifdef FPC_HAS_RESSTRINITS} + ResStrInitTables : @ResStrInitTables; +{$else FPC_HAS_RESSTRINITS} + ResStrInitTables : nil; +{$endif FPC_HAS_RESSTRINITS} + WideInitTables : @WideInitTables; + ResLocation : nil; PascalMain : @PascalMain; valgrind_used : false; OS : ( @@ -61,6 +74,9 @@ { valgind_used is the only thng that can change at startup EntryInformation.InitFinalTable:=@InitFinalTable; EntryInformation.ThreadvarTablesTable:=@ThreadvarTablesTable; + EntryInformation.ResourceStringTables:=@ResourceStringTables; + EntryInformation.ResStrInitTables:=@ResStrInitTables; + EntryInformation.WideInitTables:=@WideInitTables; EntryInformation.OS.asm_exit:=@asm_exit; EntryInformation.PascalMain:=@PascalMain;} SysInitEntryInformation.valgrind_used:=valgrind_used;