Browse Source

+ added some missing cdecl declarations to the OpenBSD startup code

git-svn-id: trunk@41766 -
nickysn 6 years ago
parent
commit
6dec9ae064

+ 0 - 1
rtl/openbsd/i386/si_c.inc

@@ -35,7 +35,6 @@ procedure _FPC_proc_start; assembler; nostackframe; public name '_start'; public
     call    _FPC_proc___start
   end;
 
-procedure _FPC_proc_haltproc; cdecl; noreturn; forward;
 function _strrchr(str: PChar; character: LongInt): PChar; forward;
 
 procedure _FPC_proc___start(argc: LongInt; argv: PPChar; envp: Pointer; para1, para2, para3: QWord); cdecl;

+ 2 - 2
rtl/openbsd/i386/si_dll.inc

@@ -17,9 +17,9 @@
 {$asmmode att}
 
 {$ifdef VER3_0}
-procedure _init; external name '_init';
+procedure _init; cdecl; external name '_init';
 {$else VER3_0}
-procedure _init; weakexternal name '_init';
+procedure _init; cdecl; weakexternal name '_init';
 {$endif VER3_0}
 
 procedure _FPC_shared_lib_start; cdecl; public name 'FPC_LIB_START';

+ 0 - 1
rtl/openbsd/i386/si_g.inc

@@ -42,7 +42,6 @@ procedure _FPC_proc_start; assembler; nostackframe; public name '_start'; public
     call    _FPC_proc___start
   end;
 
-procedure _FPC_proc_haltproc; cdecl; noreturn; forward;
 function _strrchr(str: PChar; character: LongInt): PChar; forward;
 
 procedure _FPC_proc___start(argc: LongInt; argv: PPChar; envp: Pointer; para1, para2, para3: QWord); cdecl;

+ 3 - 4
rtl/openbsd/x86_64/si_c.inc

@@ -19,7 +19,7 @@
 procedure __init; cdecl; external name '__init';
 procedure c_exit(exit_code: cint); cdecl; noreturn; external name 'exit';
 
-procedure _FPC_proc___start(argc: LongInt; argv: PPChar; envp: Pointer; para1, para2, para3: QWord); forward;
+procedure _FPC_proc___start(argc: LongInt; argv: PPChar; envp: Pointer; para1, para2, para3: QWord); cdecl; forward;
 
 procedure _FPC_proc_start; assembler; nostackframe; public name '_start'; public name '__start';
   asm
@@ -35,10 +35,9 @@ procedure _FPC_proc_start; assembler; nostackframe; public name '_start'; public
     jmp     _FPC_proc___start
   end;
 
-procedure _FPC_proc_haltproc; noreturn; forward;
 function _strrchr(str: PChar; character: LongInt): PChar; forward;
 
-procedure _FPC_proc___start(argc: LongInt; argv: PPChar; envp: Pointer; para1, para2, para3: QWord);
+procedure _FPC_proc___start(argc: LongInt; argv: PPChar; envp: Pointer; para1, para2, para3: QWord); cdecl;
   var
     I: SizeUInt;
   begin
@@ -67,7 +66,7 @@ procedure _FPC_proc___start(argc: LongInt; argv: PPChar; envp: Pointer; para1, p
     c_exit(operatingsystem_result);
   end;
 
-procedure _FPC_proc_haltproc; noreturn; public name '_haltproc';
+procedure _FPC_proc_haltproc; cdecl; noreturn; public name '_haltproc';
   begin
     c_exit(operatingsystem_result);
   end;

+ 2 - 2
rtl/openbsd/x86_64/si_dll.inc

@@ -17,9 +17,9 @@
 {$asmmode gas}
 
 {$ifdef VER3_0}
-procedure _init; external name '_init';
+procedure _init; cdecl; external name '_init';
 {$else VER3_0}
-procedure _init; weakexternal name '_init';
+procedure _init; cdecl; weakexternal name '_init';
 {$endif VER3_0}
 
 procedure _FPC_shared_lib_start; cdecl; public name 'FPC_LIB_START';

+ 3 - 4
rtl/openbsd/x86_64/si_g.inc

@@ -26,7 +26,7 @@ procedure _monstartup(lowpc, highpc: u_long); cdecl; external name '_monstartup'
 procedure __init; cdecl; external name '__init';
 procedure c_exit(exit_code: cint); cdecl; noreturn; external name 'exit';
 
-procedure _FPC_proc___start(argc: LongInt; argv: PPChar; envp: Pointer; para1, para2, para3: QWord); forward;
+procedure _FPC_proc___start(argc: LongInt; argv: PPChar; envp: Pointer; para1, para2, para3: QWord); cdecl; forward;
 
 procedure _FPC_proc_start; assembler; nostackframe; public name '_start'; public name '__start';
   asm
@@ -42,10 +42,9 @@ procedure _FPC_proc_start; assembler; nostackframe; public name '_start'; public
     jmp     _FPC_proc___start
   end;
 
-procedure _FPC_proc_haltproc; noreturn; forward;
 function _strrchr(str: PChar; character: LongInt): PChar; forward;
 
-procedure _FPC_proc___start(argc: LongInt; argv: PPChar; envp: Pointer; para1, para2, para3: QWord);
+procedure _FPC_proc___start(argc: LongInt; argv: PPChar; envp: Pointer; para1, para2, para3: QWord); cdecl;
   var
     I: SizeUInt;
   begin
@@ -76,7 +75,7 @@ procedure _FPC_proc___start(argc: LongInt; argv: PPChar; envp: Pointer; para1, p
     c_exit(operatingsystem_result);
   end;
 
-procedure _FPC_proc_haltproc; noreturn; public name '_haltproc';
+procedure _FPC_proc_haltproc; cdecl; noreturn; public name '_haltproc';
   begin
     c_exit(operatingsystem_result);
   end;

+ 2 - 2
rtl/openbsd/x86_64/si_prc.inc

@@ -32,7 +32,7 @@ procedure _FPC_proc_start; assembler; nostackframe; public name '_start'; public
     jmp     _FPC_proc___start
   end;
 
-procedure _FPC_proc_haltproc; forward;
+procedure _FPC_proc_haltproc; cdecl; forward;
 function _strrchr(str: PChar; character: LongInt): PChar; forward;
 
 procedure _FPC_proc___start(argc: LongInt; argv: PPChar; envp: Pointer; para1, para2, para3: QWord);
@@ -65,7 +65,7 @@ procedure _FPC_proc___start(argc: LongInt; argv: PPChar; envp: Pointer; para1, p
     end;
   end;
 
-procedure _FPC_proc_haltproc; assembler; nostackframe; public name '_haltproc';
+procedure _FPC_proc_haltproc; cdecl; assembler; nostackframe; public name '_haltproc';
   asm
     movq    $1,%rax
     movl    operatingsystem_result(%rip),%edi