From b525cecad8b6fba038891e2a9295a985d1cdbc37 Mon Sep 17 00:00:00 2001 From: svenbarth Date: Fri, 29 Jan 2016 14:51:15 +0000 Subject: [PATCH] - get rid of the calling convention modifier for PascalMain as it's generated using the default calling convention anyway (without any parameters this luckily doesn't matter that much ;) ) (Note: adjusted merge info as in my packages branch there is a less complete commit for this) git-svn-id: trunk@33023 - --- rtl/aix/system.pp | 2 +- rtl/bsd/system.pp | 2 +- rtl/inc/systemh.inc | 2 +- rtl/java/jsystemh_types.inc | 2 +- rtl/nativent/system.pp | 2 +- rtl/solaris/i386/start.inc | 2 +- rtl/solaris/sparc/start.inc | 2 +- rtl/solaris/x86_64/start.inc | 2 +- rtl/symbian/system.pp | 2 +- rtl/win32/sysinit.inc | 2 +- rtl/win32/system.pp | 2 +- rtl/win64/system.pp | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/rtl/aix/system.pp b/rtl/aix/system.pp index be470a87f4..d39523e2a2 100644 --- a/rtl/aix/system.pp +++ b/rtl/aix/system.pp @@ -39,7 +39,7 @@ implementation Misc. System Dependent Functions *****************************************************************************} -procedure pascalmain;cdecl;external name 'PASCALMAIN'; +procedure pascalmain;external name 'PASCALMAIN'; procedure FPC_SYSTEMMAIN(argcparam: Longint; argvparam: ppchar; envpparam: ppchar); cdecl; [public]; diff --git a/rtl/bsd/system.pp b/rtl/bsd/system.pp index 5054e5ff43..5432375d53 100644 --- a/rtl/bsd/system.pp +++ b/rtl/bsd/system.pp @@ -296,7 +296,7 @@ end; {$ifdef Darwin} -procedure pascalmain;cdecl;external name 'PASCALMAIN'; +procedure pascalmain;external name 'PASCALMAIN'; procedure FPC_SYSTEMMAIN(argcparam: Longint; argvparam: ppchar; envpparam: ppchar); cdecl; [public]; diff --git a/rtl/inc/systemh.inc b/rtl/inc/systemh.inc index 48454a0e28..c19271d79f 100644 --- a/rtl/inc/systemh.inc +++ b/rtl/inc/systemh.inc @@ -605,7 +605,7 @@ type InitFinalTable : Pointer; ThreadvarTablesTable : Pointer; asm_exit : Procedure;stdcall; - PascalMain : Procedure;stdcall; + PascalMain : Procedure; valgrind_used : boolean; end; diff --git a/rtl/java/jsystemh_types.inc b/rtl/java/jsystemh_types.inc index 78595a2458..e6470ea5f7 100644 --- a/rtl/java/jsystemh_types.inc +++ b/rtl/java/jsystemh_types.inc @@ -541,7 +541,7 @@ type InitFinalTable : Pointer; ThreadvarTablesTable : Pointer; asm_exit : Procedure;stdcall; - PascalMain : Procedure;stdcall; + PascalMain : Procedure; valgrind_used : boolean; end; *) diff --git a/rtl/nativent/system.pp b/rtl/nativent/system.pp index adac353973..5f14fbd60b 100644 --- a/rtl/nativent/system.pp +++ b/rtl/nativent/system.pp @@ -276,7 +276,7 @@ end; System Dependent Exit code *****************************************************************************} -procedure PascalMain;stdcall;external name 'PASCALMAIN'; +procedure PascalMain;external name 'PASCALMAIN'; {$ifndef KMODE} function NtTerminateProcess(aProcess: THandle; aStatus: LongInt): LongInt; stdcall; external ntdll name 'NtTerminateProcess'; diff --git a/rtl/solaris/i386/start.inc b/rtl/solaris/i386/start.inc index 42c4e97239..a15d25b3fe 100644 --- a/rtl/solaris/i386/start.inc +++ b/rtl/solaris/i386/start.inc @@ -26,7 +26,7 @@ procedure _exit;cdecl;external 'c' name '_exit'; //procedure __fpstart;cdecl;external 'c' name '__fpstart'{ @plt }; //procedure __fsr;cdecl;external 'c' name '__fsr'; //procedure _init;cdecl;external 'c' name '_init'; -procedure PascalMain;cdecl;external name 'PASCALMAIN'; +procedure PascalMain;external name 'PASCALMAIN'; {vars are not correctly transformed :( diff --git a/rtl/solaris/sparc/start.inc b/rtl/solaris/sparc/start.inc index 6a6c096ea4..4ec19b23d7 100644 --- a/rtl/solaris/sparc/start.inc +++ b/rtl/solaris/sparc/start.inc @@ -20,7 +20,7 @@ function atexit(proc:TCdeclProcedure):longint;cdecl;external 'c' name 'atexit'; procedure _cleanup;cdecl;external 'c' name '_cleanup'; procedure _DYNAMIC;cdecl;external 'c' name '_DYNAMIC'; procedure __fpstart;cdecl;external 'c' name '__fpstart'; -procedure PascalMain;cdecl;external name 'PASCALMAIN'; +procedure PascalMain;external name 'PASCALMAIN'; procedure _start;assembler;nostackframe;public name '_start'; asm diff --git a/rtl/solaris/x86_64/start.inc b/rtl/solaris/x86_64/start.inc index e33644e3c7..1b2dac609d 100644 --- a/rtl/solaris/x86_64/start.inc +++ b/rtl/solaris/x86_64/start.inc @@ -72,7 +72,7 @@ procedure _exit;cdecl;external 'c' name '_exit'; //procedure __fpstart;cdecl;external 'c' name '__fpstart'{ @plt }; //procedure __fsr;cdecl;external 'c' name '__fsr'; //procedure _init;cdecl;external 'c' name '_init'; -procedure PascalMain;cdecl;external name 'PASCALMAIN'; +procedure PascalMain;external name 'PASCALMAIN'; {vars are not correctly transformed :( diff --git a/rtl/symbian/system.pp b/rtl/symbian/system.pp index 79075b46ca..d27590f339 100644 --- a/rtl/symbian/system.pp +++ b/rtl/symbian/system.pp @@ -161,7 +161,7 @@ end; System Dependent Exit code *****************************************************************************} -//procedure PascalMain; stdcall; external name 'PASCALMAIN'; +//procedure PascalMain; external name 'PASCALMAIN'; //procedure fpc_do_exit; stdcall; external name 'FPC_DO_EXIT'; Procedure system_exit; diff --git a/rtl/win32/sysinit.inc b/rtl/win32/sysinit.inc index c2d1f6e8aa..df62b90511 100644 --- a/rtl/win32/sysinit.inc +++ b/rtl/win32/sysinit.inc @@ -38,7 +38,7 @@ procedure EXE_Entry(const info : TEntryInformation); external name '_FPC_EXE_Entry'; function DLL_Entry(const info : TEntryInformation) : longbool; external name '_FPC_DLL_Entry'; - procedure PascalMain;stdcall;external name 'PASCALMAIN'; + procedure PascalMain;external name 'PASCALMAIN'; function GetStdHandle(nStdHandle:DWORD) : THandle; stdcall; external 'kernel32' name 'GetStdHandle'; function GetConsoleMode(hConsoleHandle: THandle; var lpMode: DWORD): Boolean; stdcall; external 'kernel32' name 'GetConsoleMode'; diff --git a/rtl/win32/system.pp b/rtl/win32/system.pp index e3697d1835..0bb5d3bf3a 100644 --- a/rtl/win32/system.pp +++ b/rtl/win32/system.pp @@ -114,7 +114,7 @@ var SysInstance : Longint;public name '_FPC_SysInstance'; InitFinalTable : record end; external name 'INITFINAL'; ThreadvarTablesTable : record end; external name 'FPC_THREADVARTABLES'; - procedure PascalMain;stdcall;external name 'PASCALMAIN'; + procedure PascalMain;external name 'PASCALMAIN'; procedure asm_exit;stdcall;external name 'asm_exit'; const EntryInformation : TEntryInformation = ( diff --git a/rtl/win64/system.pp b/rtl/win64/system.pp index 3bdb41a1db..2df83b7e21 100644 --- a/rtl/win64/system.pp +++ b/rtl/win64/system.pp @@ -137,7 +137,7 @@ end; {$ifndef FPC_USE_WIN64_SEH} procedure install_exception_handlers;forward; {$endif FPC_USE_WIN64_SEH} -procedure PascalMain;stdcall;external name 'PASCALMAIN'; +procedure PascalMain;external name 'PASCALMAIN'; { include code common with win32 } {$I syswin.inc}