paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-07 21:07:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge revision(s) 32484 from branches/svenbarth/packages

Browse Source 
Move PascalMain external from the si_*.inc files to a new include file si_impl.inc that's included in the implementation sections of the si_*.pp units

git-svn-id: trunk@33970 -
This commit is contained in:
svenbarth 2016-06-12 16:49:56 +00:00
parent bb853d135c
commit 266eccde9f
23 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -9130,6 +9130,7 @@ rtl/linux/si_c21.pp svneol=native#text/plain
rtl/linux/si_c21g.pp svneol=native#text/plain
rtl/linux/si_dll.pp svneol=native#text/plain
rtl/linux/si_g.pp svneol=native#text/plain
rtl/linux/si_impl.inc svneol=native#text/plain
rtl/linux/si_intf.inc svneol=native#text/plain
rtl/linux/si_prc.pp svneol=native#text/plain
rtl/linux/si_uc.pp svneol=native#text/plain

1
rtl/linux/i386/si_c.inc
View File

@ -45,7 +45,6 @@ procedure libc_init; external name '__libc_init';
procedure libc_setfpucw; external name '__setfpucw';
procedure libc_start_main; external name '__libc_start_main';
procedure PASCALMAIN; external name 'PASCALMAIN';
Procedure fpc_geteipasebx;[external name 'fpc_geteipasebx'];
{******************************************************************************

1
rtl/linux/i386/si_c21.inc
View File

@ -39,7 +39,6 @@ procedure __libc_csu_init; cdecl; external;
procedure __libc_csu_fini; cdecl; external;
procedure libc_start_main; external name '__libc_start_main';
procedure libc_exit(code: longint); cdecl; external name 'exit';
procedure PASCALMAIN; external name 'PASCALMAIN';
{******************************************************************************

2
rtl/linux/i386/si_dll.inc
View File

@ -13,8 +13,6 @@
**********************************************************************}
{$asmmode att}
procedure PASCALMAIN; external name 'PASCALMAIN';
{******************************************************************************
Shared library start/halt

2
rtl/linux/i386/si_g.inc
View File

@ -46,8 +46,6 @@ procedure libc_init; external name '__libc_init';
procedure libc_setfpucw; external name '__setfpucw';
procedure libc_start_main; external name '__libc_start_main';
procedure PASCALMAIN; external name 'PASCALMAIN';
{******************************************************************************
Process + profiling start/halt
******************************************************************************}

2
rtl/linux/i386/si_prc.inc
View File

@ -34,8 +34,6 @@
argc <--- esp
}
procedure PASCALMAIN; external name 'PASCALMAIN';
{******************************************************************************
Process start/halt
******************************************************************************}

1
rtl/linux/i386/si_uc.inc
View File

@ -47,7 +47,6 @@ procedure uclibc_init; external name '__uClibc_init';
procedure uclibc_fini; external name '__uClibc_fini';
procedure uclibc_exit; external name 'exit';
procedure uclibc_main; external name '__uClibc_main';
procedure PASCALMAIN; external name 'PASCALMAIN';
{ Some helpers }

2
rtl/linux/powerpc64/si_c.inc
View File

@ -657,8 +657,6 @@ _restvr_31: addi r12,r0,-16
Process start/halt
******************************************************************************}
procedure PASCALMAIN; external name 'PASCALMAIN';
procedure __libc_csu_init; cdecl; external;
procedure __libc_csu_fini; cdecl; external;

2
rtl/linux/powerpc64/si_dll.inc
View File

@ -628,8 +628,6 @@ _restvr_31: addi r12,r0,-16
var
TOCSTART: pointer; external name '.TOC.';
procedure PASCALMAIN; external name 'PASCALMAIN';
procedure save_argc_argv_envp_stkptr_fpcret(argc: longint; argv, envp: ppchar; stkptr: pointer);
begin

2
rtl/linux/powerpc64/si_g.inc
View File

@ -657,8 +657,6 @@ _restvr_31: addi r12,r0,-16
Process start/halt
******************************************************************************}
procedure PASCALMAIN; external name 'PASCALMAIN';
procedure __libc_csu_init; cdecl; external;
procedure __libc_csu_fini; cdecl; external;

2
rtl/linux/powerpc64/si_prc.inc
View File

@ -625,8 +625,6 @@ _restvr_31: addi r12,r0,-16
Process start/halt
******************************************************************************}
procedure PASCALMAIN; external name 'PASCALMAIN';
type
tdlfiniproc = procedure; cdecl;

1
rtl/linux/si_c.pp
View File

@ -21,6 +21,7 @@ interface
implementation
{$i sysnr.inc}
{$i si_impl.inc}
{$i si_c.inc}
end.

1
rtl/linux/si_c21.pp
View File

@ -21,6 +21,7 @@ interface
implementation
{$i sysnr.inc}
{$i si_impl.inc}
{$i si_c21.inc}
end.

1
rtl/linux/si_c21g.pp
View File

@ -21,6 +21,7 @@ interface
implementation
{$i sysnr.inc}
{$i si_impl.inc}
{$i si_c21.inc}
var

1
rtl/linux/si_dll.pp
View File

@ -21,6 +21,7 @@ interface
implementation
{$i sysnr.inc}
{$i si_impl.inc}
{$i si_dll.inc}
end.

1
rtl/linux/si_g.pp
View File

@ -21,6 +21,7 @@ interface
implementation
{$i sysnr.inc}
{$i si_impl.inc}
{$i si_g.inc}
end.

15
rtl/linux/si_impl.inc Normal file
View File

@ -0,0 +1,15 @@
{
This file is part of the Free Pascal run time library.
Copyright (c) 2015 by Sven Barth, member of the Free Pascal development
team.
See the file COPYING.FPC, included in this distribution,
for details about the copyright.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
**********************************************************************}
procedure PascalMain; external name 'PASCALMAIN';

1
rtl/linux/si_prc.pp
View File

@ -21,6 +21,7 @@ interface
implementation
{$i sysnr.inc}
{$i si_impl.inc}
{$i si_prc.inc}
end.

1
rtl/linux/si_uc.pp
View File

@ -21,6 +21,7 @@ interface
implementation
{$i sysnr.inc}
{$i si_impl.inc}
{$i si_uc.inc}
end.

2
rtl/linux/x86_64/si_c.inc
View File

@ -50,8 +50,6 @@ procedure libc_init; external name '__libc_init';
procedure libc_setfpucw; external name '__setfpucw';
procedure libc_start_main; external name '__libc_start_main';
procedure PASCALMAIN; external name 'PASCALMAIN';
procedure main_stub; assembler; nostackframe;
asm
{ save return address }

2
rtl/linux/x86_64/si_dll.inc
View File

@ -14,8 +14,6 @@
{$asmmode gas}
procedure PASCALMAIN; external name 'PASCALMAIN';
procedure _FPC_shared_lib_start(argc:dword; argv,envp:pointer); cdecl; public name 'FPC_SHARED_LIB_START'; public name '_start';
begin
operatingsystem_parameter_argc:=argc;

1
rtl/linux/x86_64/si_g.inc
View File

@ -53,7 +53,6 @@ procedure libc_start_main; external name '__libc_start_main';
procedure gmon_monstartup; external name 'monstartup';
procedure gmon_mcleanup; external name '_mcleanup';
procedure PASCALMAIN; external name 'PASCALMAIN';
procedure main_stub; forward;
procedure ini_dummy;

2
rtl/linux/x86_64/si_prc.inc
View File

@ -35,8 +35,6 @@
{$L abitag.o}
procedure PASCALMAIN; external name 'PASCALMAIN';
{******************************************************************************
Process start/halt
******************************************************************************}