asm_exit is only needed on Win32 (Note: the removal of asm_exit from TEntryInformation in the previous commit should have been in this one -.- )

rtl/win32/sysosh.inc:
  + add TEntryInformationOS for Win32 which contains asm_exit
rtl/win32/system.pp:
  * EntryInformation: adjust initialization
  * system_exit: call the correct function variable
rtl/win32/sysinit.inc:
  * SysInitEntryInformation: adjust initialization
  * SetupEntryInformation: adjust commented setup of the function variable
rtl/java/jsystemh_types.inc:
  * adjust TEntryInformation for consistency reasons

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@33025 3ad0048d-3df7-0310-abae-a5850022a9f2

2 files changed, 8 insertions, 4 deletions

diff --git a/rtl/win32/sysinit.inc b/rtl/win32/sysinit.inc
index df62b90511..df8e886a1d 100644
--- a/rtl/win32/sysinit.inc
+++ b/rtl/win32/sysinit.inc
@@ -48,9 +48,11 @@
       SysInitEntryInformation : TEntryInformation = (
         InitFinalTable : @InitFinalTable;
         ThreadvarTablesTable : @ThreadvarTablesTable;
-        asm_exit : @asm_exit;
         PascalMain : @PascalMain;
         valgrind_used : false;
+        OS : (
+          asm_exit : @asm_exit;
+          );
         );
 
 
@@ -59,7 +61,7 @@
         { valgind_used is the only thng that can change at startup
         EntryInformation.InitFinalTable:=@InitFinalTable;
         EntryInformation.ThreadvarTablesTable:=@ThreadvarTablesTable;
-        EntryInformation.asm_exit:=@asm_exit;
+        EntryInformation.OS.asm_exit:=@asm_exit;
         EntryInformation.PascalMain:=@PascalMain;}
         SysInitEntryInformation.valgrind_used:=valgrind_used;
       end;
diff --git a/rtl/win32/system.pp b/rtl/win32/system.pp
index 0bb5d3bf3a..a0ec8133d3 100644
--- a/rtl/win32/system.pp
+++ b/rtl/win32/system.pp
@@ -120,9 +120,11 @@ const
   EntryInformation : TEntryInformation = (
     InitFinalTable : @InitFinalTable;
     ThreadvarTablesTable : @ThreadvarTablesTable;
-    asm_exit : @asm_exit;
     PascalMain : @PascalMain;
     valgrind_used : false;
+    OS : (
+      asm_exit: @asm_exit;
+      );
     );
 
 {$ifdef FPC_USE_WIN32_SEH}
@@ -183,7 +185,7 @@ begin
 {$endif FPC_USE_WIN32_SEH}
 
   { do cleanup required by the startup code }
-  EntryInformation.asm_exit();
+  EntryInformation.OS.asm_exit();
 
   { call exitprocess, with cleanup as required }
   ExitProcess(exitcode);