* Reverted r8082

git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_2_2@8087 3ad0048d-3df7-0310-abae-a5850022a9f2

2 files changed, 5 insertions, 10 deletions

diff --git a/rtl/linux/linux.pp b/rtl/linux/linux.pp
index 625756ac47..49b575880a 100644
--- a/rtl/linux/linux.pp
+++ b/rtl/linux/linux.pp
@@ -197,12 +197,6 @@ function epoll_wait(epfd: cint; events: pepoll_event; maxevents, timeout: cint):
 
 implementation
 
-// FUTEX_OP is a macro, doesn't exist in libC as function
-function FUTEX_OP(op, oparg, cmp, cmparg: cint): cint; {$ifdef SYSTEMINLINE}inline;{$endif}
-begin
-  FUTEX_OP := ((op and $F) shl 28) or ((cmp and $F) shl 24) or ((oparg and $FFF) shl 12) or (cmparg and $FFF);
-end;
-
 {$ifndef FPC_USE_LIBC}
 Uses Syscall;
 
@@ -293,6 +287,11 @@ begin
 {$endif cpum68k}
 end;
 
+function FUTEX_OP(op, oparg, cmp, cmparg: cint): cint;
+begin
+  FUTEX_OP := ((op and $F) shl 28) or ((cmp and $F) shl 24) or ((oparg and $FFF) shl 12) or (cmparg and $FFF);
+end;
+
 function epoll_create(size: cint): cint;
 begin
   epoll_create := do_syscall(syscall_nr_epoll_create,tsysparam(size));
diff --git a/rtl/linux/system.pp b/rtl/linux/system.pp
index 74c5947ea0..563bba4deb 100644
--- a/rtl/linux/system.pp
+++ b/rtl/linux/system.pp
@@ -299,10 +299,6 @@ end;
 var
   initialstkptr : Pointer;external name '__stkptr';
 begin
-{$if defined(i386) and not defined(FPC_USE_LIBC)}
-  InitSyscallIntf;
-{$endif}
-
   SysResetFPU;
 {$if defined(cpupowerpc)}
   // some PPC kernels set the exception bits FE0/FE1 in the MSR to zero,