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 -
This commit is contained in:
svenbarth 2016-01-29 16:24:53 +00:00
parent 7e1e947b71
commit 0491bca72a
2 changed files with 4 additions and 14 deletions

View File

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

View File

@ -112,20 +112,6 @@ implementation
var var
SysInstance : Longint;public name '_FPC_SysInstance'; 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} {$ifdef FPC_USE_WIN32_SEH}
function main_wrapper(arg: Pointer; proc: Pointer): ptrint; forward; function main_wrapper(arg: Pointer; proc: Pointer): ptrint; forward;