Browse Source

* correctly disable the Atomic*Lock functions for the fpc_atomic_cmp_xchg_*() helper fallback of the CPU size

Sven/Sarah Barth 8 months ago
parent
commit
ae938e16a5
1 changed files with 8 additions and 8 deletions
  1. 8 8
      rtl/inc/generic.inc

+ 8 - 8
rtl/inc/generic.inc

@@ -3560,13 +3560,13 @@ procedure AtomicLeaveLock; forward;
 {$endif}
 {$endif}
 function fpc_atomic_cmp_xchg_8(var Target: shortint; NewValue: shortint; Comparand: shortint): shortint;compilerproc;
 function fpc_atomic_cmp_xchg_8(var Target: shortint; NewValue: shortint; Comparand: shortint): shortint;compilerproc;
 begin
 begin
-  {$ifdef FPC_SYSTEM_ATOMIC_8_NO_LOCK}
+  {$ifndef FPC_SYSTEM_ATOMIC_8_NO_LOCK}
   AtomicEnterLock;
   AtomicEnterLock;
   {$endif FPC_SYSTEM_ATOMIC_8_NO_LOCK}
   {$endif FPC_SYSTEM_ATOMIC_8_NO_LOCK}
   Result:=Target;
   Result:=Target;
   if Target=Comparand then
   if Target=Comparand then
     Target:=NewValue;
     Target:=NewValue;
-  {$ifdef FPC_SYSTEM_ATOMIC_8_NO_LOCK}
+  {$ifndef FPC_SYSTEM_ATOMIC_8_NO_LOCK}
   AtomicLeaveLock;
   AtomicLeaveLock;
   {$endif FPC_SYSTEM_ATOMIC_8_NO_LOCK}
   {$endif FPC_SYSTEM_ATOMIC_8_NO_LOCK}
 end;
 end;
@@ -3581,13 +3581,13 @@ end;
 {$endif}
 {$endif}
 function fpc_atomic_cmp_xchg_16(var Target: smallint; NewValue: smallint; Comparand: smallint): smallint;compilerproc;
 function fpc_atomic_cmp_xchg_16(var Target: smallint; NewValue: smallint; Comparand: smallint): smallint;compilerproc;
 begin
 begin
-  {$ifdef FPC_SYSTEM_ATOMIC_16_NO_LOCK}
+  {$ifndef FPC_SYSTEM_ATOMIC_16_NO_LOCK}
   AtomicEnterLock;
   AtomicEnterLock;
   {$endif FPC_SYSTEM_ATOMIC_16_NO_LOCK}
   {$endif FPC_SYSTEM_ATOMIC_16_NO_LOCK}
   Result:=Target;
   Result:=Target;
   if Target=Comparand then
   if Target=Comparand then
     Target:=NewValue;
     Target:=NewValue;
-  {$ifdef FPC_SYSTEM_ATOMIC_16_NO_LOCK}
+  {$ifndef FPC_SYSTEM_ATOMIC_16_NO_LOCK}
   AtomicLeaveLock;
   AtomicLeaveLock;
   {$endif FPC_SYSTEM_ATOMIC_16_NO_LOCK}
   {$endif FPC_SYSTEM_ATOMIC_16_NO_LOCK}
 end;
 end;
@@ -3602,13 +3602,13 @@ end;
 {$endif}
 {$endif}
 function fpc_atomic_cmp_xchg_32(var Target: longint; NewValue: longint; Comparand: longint): longint;compilerproc;
 function fpc_atomic_cmp_xchg_32(var Target: longint; NewValue: longint; Comparand: longint): longint;compilerproc;
 begin
 begin
-  {$ifdef FPC_SYSTEM_ATOMIC_32_NO_LOCK}
+  {$ifndef FPC_SYSTEM_ATOMIC_32_NO_LOCK}
   AtomicEnterLock;
   AtomicEnterLock;
   {$endif FPC_SYSTEM_ATOMIC_32_NO_LOCK}
   {$endif FPC_SYSTEM_ATOMIC_32_NO_LOCK}
   Result:=Target;
   Result:=Target;
   if Target=Comparand then
   if Target=Comparand then
     Target:=NewValue;
     Target:=NewValue;
-  {$ifdef FPC_SYSTEM_ATOMIC_32_NO_LOCK}
+  {$ifndef FPC_SYSTEM_ATOMIC_32_NO_LOCK}
   AtomicLeaveLock;
   AtomicLeaveLock;
   {$endif FPC_SYSTEM_ATOMIC_32_NO_LOCK}
   {$endif FPC_SYSTEM_ATOMIC_32_NO_LOCK}
 end;
 end;
@@ -3623,13 +3623,13 @@ end;
 {$endif}
 {$endif}
 function fpc_atomic_cmp_xchg_64(var Target: int64; NewValue: int64; Comparand: int64): int64;compilerproc;
 function fpc_atomic_cmp_xchg_64(var Target: int64; NewValue: int64; Comparand: int64): int64;compilerproc;
 begin
 begin
-  {$ifdef FPC_SYSTEM_ATOMIC_64_NO_LOCK}
+  {$ifndef FPC_SYSTEM_ATOMIC_64_NO_LOCK}
   AtomicEnterLock;
   AtomicEnterLock;
   {$endif FPC_SYSTEM_ATOMIC_64_NO_LOCK}
   {$endif FPC_SYSTEM_ATOMIC_64_NO_LOCK}
   Result:=Target;
   Result:=Target;
   if Target=Comparand then
   if Target=Comparand then
     Target:=NewValue;
     Target:=NewValue;
-  {$ifdef FPC_SYSTEM_ATOMIC_64_NO_LOCK}
+  {$ifndef FPC_SYSTEM_ATOMIC_64_NO_LOCK}
   AtomicLeaveLock;
   AtomicLeaveLock;
   {$endif FPC_SYSTEM_ATOMIC_64_NO_LOCK}
   {$endif FPC_SYSTEM_ATOMIC_64_NO_LOCK}
 end;
 end;