Explorar o código

* fix sysenter variable duplication

git-svn-id: trunk@8406 -
Almindor %!s(int64=18) %!d(string=hai) anos
pai
achega
a42b134a81
Modificáronse 3 ficheiros con 8 adicións e 5 borrados
  1. 3 0
      rtl/linux/i386/syscall.inc
  2. 0 4
      rtl/linux/i386/syscallh.inc
  3. 5 1
      rtl/linux/system.pp

+ 3 - 0
rtl/linux/i386/syscall.inc

@@ -44,6 +44,9 @@ type
   TElf32AuxiliaryVector = Elf32_auxv_t;
   PElf32AuxiliaryVector = ^TElf32AuxiliaryVector;
 
+var
+  psysinfo: LongWord = 0;
+
 procedure InitSyscallIntf;
 var
   ep: PPChar;

+ 0 - 4
rtl/linux/i386/syscallh.inc

@@ -33,10 +33,6 @@ Type
 
   TSysParam  = Longint;
   
-var
-  psysinfo: LongWord;
-  sysenter_supported: LongInt = 0;
-
 function Do_SysCall(sysnr:TSysParam):TSysResult; register; external name 'FPC_SYSCALL0';
 function Do_SysCall(sysnr,param1:TSysParam):TSysResult; register; external name 'FPC_SYSCALL1';
 function Do_SysCall(sysnr,param1,param2:TSysParam):TSysResult; register; external name 'FPC_SYSCALL2';

+ 5 - 1
rtl/linux/system.pp

@@ -52,6 +52,11 @@ property cmdline:Pchar read get_cmdline;
                                  implementation
 {*****************************************************************************}
 
+{$if defined(i386) and not defined(FPC_USE_LIBC)}
+var
+  sysenter_supported: LongInt = 0;
+{$endif}
+
 { Include ELF resources }
 
 {$ifdef ELFRES32}
@@ -294,7 +299,6 @@ begin
     result := stklen;
 end;
 
-
 var
   initialstkptr : Pointer;external name '__stkptr';
 begin