Bläddra i källkod

* fixed error, caused by double definition of operatingsystem_result

git-svn-id: trunk@41701 -
nickysn 6 år sedan
förälder
incheckning
29557b97fb
3 ändrade filer med 4 tillägg och 2 borttagningar
  1. 3 0
      rtl/openbsd/si_impl.inc
  2. 0 1
      rtl/openbsd/si_intf.inc
  3. 1 1
      rtl/openbsd/x86_64/si_prc.inc

+ 3 - 0
rtl/openbsd/si_impl.inc

@@ -13,3 +13,6 @@
  **********************************************************************}
 
 procedure PascalMain; external name 'PASCALMAIN';
+
+var
+  operatingsystem_result: longint; external name 'operatingsystem_result';

+ 0 - 1
rtl/openbsd/si_intf.inc

@@ -20,7 +20,6 @@ var
   operatingsystem_parameter_envp: ppchar; public name 'operatingsystem_parameter_envp';
   operatingsystem_parameter_argc: longint; public name 'operatingsystem_parameter_argc';
   operatingsystem_parameter_argv: ppchar; public name 'operatingsystem_parameter_argv';
-  operatingsystem_result: word; public name 'operatingsystem_result';
   environ: ppchar; public name 'environ';
   __progname: pchar = ''; public name '__progname';
   __progname_storage: array [0..255] of char; public name '__progname_storage';

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

@@ -118,7 +118,7 @@ procedure _FPC_proc___start; assembler; nostackframe; public name '___start';
 procedure _FPC_proc_haltproc; assembler; nostackframe; public name '_haltproc';
   asm
     movq    $1,%rax
-    movzwq  operatingsystem_result(%rip),%rbx
+    movl    operatingsystem_result(%rip),%ebx
     pushq   %rbx
     call    .Lactualsyscall
     addq    $8,%rsp