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

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 -

.gitattributes

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

rtl/linux/i386/si_c.inc

@@ -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'];
 
 {******************************************************************************

rtl/linux/i386/si_c21.inc

@@ -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';
 
 
 {******************************************************************************

rtl/linux/i386/si_dll.inc

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

rtl/linux/i386/si_g.inc

@@ -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
  ******************************************************************************}

rtl/linux/i386/si_prc.inc

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

rtl/linux/i386/si_uc.inc

@@ -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 }
 

rtl/linux/powerpc64/si_c.inc

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

rtl/linux/powerpc64/si_dll.inc

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

rtl/linux/powerpc64/si_g.inc

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

rtl/linux/powerpc64/si_prc.inc

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

rtl/linux/si_c.pp

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

rtl/linux/si_c21.pp

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

rtl/linux/si_c21g.pp

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

rtl/linux/si_dll.pp

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

rtl/linux/si_g.pp

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

rtl/linux/si_impl.inc

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

rtl/linux/si_prc.pp

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

rtl/linux/si_uc.pp

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

rtl/linux/x86_64/si_c.inc

@@ -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 }

rtl/linux/x86_64/si_dll.inc

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

rtl/linux/x86_64/si_g.inc

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

rtl/linux/x86_64/si_prc.inc

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