- 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

@@ -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];
 

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];
 

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;
 

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;
 *)

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';

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 :(

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

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 :(

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;

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';

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 = (

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}