diff --git a/compiler/options.pas b/compiler/options.pas index a53123787b..3d2444de9c 100644 --- a/compiler/options.pas +++ b/compiler/options.pas @@ -2358,8 +2358,6 @@ begin { Temporary defines, until things settle down } { "main" symbol is generated in the main program, and left out of the system unit } - def_system_macro('FPC_DARWIN_PASCALMAIN'); - def_system_macro('FPC_DARWIN_JMP_MAIN'); def_system_macro('PARAOUTFILE'); def_system_macro('RESSTRSECTIONS'); def_system_macro('FPC_HASFIXED64BITVARIANT'); diff --git a/rtl/bsd/system.pp b/rtl/bsd/system.pp index da2423c680..432800e12e 100644 --- a/rtl/bsd/system.pp +++ b/rtl/bsd/system.pp @@ -1,5 +1,5 @@ { - This file is part of the Free Pascal run time librar~y. + This file is part of the Free Pascal run time library. Copyright (c) 2000 by Marco van de Voort member of the Free Pascal development team. @@ -266,18 +266,9 @@ end; {$ifdef Darwin} -{$ifndef FPC_DARWIN_PASCALMAIN} -procedure pascalmain;external name 'PASCALMAIN'; -{ Main entry point in C style, needed to capture program parameters. } - -procedure main(argcparam: Longint; argvparam: ppchar; envpparam: ppchar); cdecl; [public]; -{$else FPC_DARWIN_PASCALMAIN} - -{$ifdef FPC_DARWIN_JMP_MAIN} procedure pascalmain;cdecl;external name 'PASCALMAIN'; -{$endif} + procedure FPC_SYSTEMMAIN(argcparam: Longint; argvparam: ppchar; envpparam: ppchar); cdecl; [public]; -{$endif FPC_DARWIN_PASCALMAIN} begin argc:= argcparam; @@ -286,9 +277,7 @@ begin {$ifdef cpui386} Set8087CW(Default8087CW); {$endif cpui386} -{$if not defined(FPC_DARWIN_PASCALMAIN) or defined(FPC_DARWIN_JMP_MAIN)} pascalmain; {run the pascal main program} -{$endif} end; {$endif Darwin} {$endif FPC_USE_LIBC}