소스 검색

inc/system.inc:
+ add (uninitialized) global variable EntryInformation for systems that use indirect main information
win32/system.pp:
- remove initialized EntryInformation and instead rely on the one passed by the sysinit* units

git-svn-id: trunk@33026 -

svenbarth 9 년 전
부모
커밋
0491bca72a
2개의 변경된 파일4개의 추가작업 그리고 14개의 파일을 삭제
  1. 4 0
      rtl/inc/system.inc
  2. 0 14
      rtl/win32/system.pp

+ 4 - 0
rtl/inc/system.inc

@@ -101,6 +101,10 @@ var
   initialstklen : SizeUint;external name '__stklen';
 {$endif FPC_NO_GENERIC_STACK_CHECK}
 
+{$ifdef FPC_HAS_INDIRECT_MAIN_INFORMATION}
+  EntryInformation: TEntryInformation;
+{$endif FPC_HAS_INDIRECT_MAIN_INFORMATION}
+
 { checks whether the given suggested size for the stack of the current
  thread is acceptable. If this is the case, returns it unaltered.
  Otherwise it should return an acceptable value.

+ 0 - 14
rtl/win32/system.pp

@@ -112,20 +112,6 @@ implementation
 
 var
   SysInstance : Longint;public name '_FPC_SysInstance';
-  InitFinalTable : record end; external name 'INITFINAL';
-  ThreadvarTablesTable : record end; external name 'FPC_THREADVARTABLES';
-  procedure PascalMain;external name 'PASCALMAIN';
-  procedure asm_exit;stdcall;external name 'asm_exit';
-const
-  EntryInformation : TEntryInformation = (
-    InitFinalTable : @InitFinalTable;
-    ThreadvarTablesTable : @ThreadvarTablesTable;
-    PascalMain : @PascalMain;
-    valgrind_used : false;
-    OS : (
-      asm_exit: @asm_exit;
-      );
-    );
 
 {$ifdef FPC_USE_WIN32_SEH}
 function main_wrapper(arg: Pointer; proc: Pointer): ptrint; forward;