[Ada] Use atomic builtins for atomic counters on x86 (32bit)
Commit Message
Remove the x86-specific (32bit) variant of System.Atomic_Counters,
because the __atomic builtins work fine on all x86 CPUs except for i386,
where they can be provided by libatomic (when compiling with
-march=i386).
Tested on x86_64-pc-linux-gnu, committed on trunk
gcc/ada/
* Makefile.rtl (X86_TARGET_PAIRS): Use __builtin variant of
System.Atomic_Counters.
* libgnat/s-atocou__x86.adb: Remove.
@@ -898,7 +898,7 @@ ATOMICS_BUILTINS_TARGET_PAIRS = \
X86_TARGET_PAIRS = \
a-nuauco.ads<libgnat/a-nuauco__x86.ads \
- s-atocou.adb<libgnat/s-atocou__x86.adb
+ s-atocou.adb<libgnat/s-atocou__builtin.adb
X86_64_TARGET_PAIRS = \
a-nuauco.ads<libgnat/a-nuauco__x86.ads \
deleted file mode 100644
@@ -1,112 +0,0 @@
-------------------------------------------------------------------------------
-------------------------------------------------------------------------------
-
-
-with System.Machine_Code;
-
-package body System.Atomic_Counters is
-
- -- Add comments showing in normal asm language what we generate???
-
- ---------------
- -- Decrement --
- ---------------
-
- function Decrement (Item : aliased in out Atomic_Unsigned) return Boolean is
- Aux : Boolean;
-
- begin
- System.Machine_Code.Asm
- (Template =>
- "lock%; decl" & ASCII.HT & "%0" & ASCII.LF & ASCII.HT
- & "sete %1",
- Outputs =>
- (Atomic_Unsigned'Asm_Output ("=m", Item),
- Boolean'Asm_Output ("=qm", Aux)),
- Inputs => Atomic_Unsigned'Asm_Input ("m", Item),
- Volatile => True);
-
- return Aux;
- end Decrement;
-
- procedure Decrement (Item : aliased in out Atomic_Unsigned) is
- begin
- if Decrement (Item) then
- null;
- end if;
- end Decrement;
-
- function Decrement (Item : in out Atomic_Counter) return Boolean is
- begin
- return Decrement (Item.Value);
- end Decrement;
-
- ---------------
- -- Increment --
- ---------------
-
- procedure Increment (Item : aliased in out Atomic_Unsigned) is
- begin
- System.Machine_Code.Asm
- (Template => "lock%; incl" & ASCII.HT & "%0",
- Outputs => Atomic_Unsigned'Asm_Output ("=m", Item),
- Inputs => Atomic_Unsigned'Asm_Input ("m", Item),
- Volatile => True);
- end Increment;
-
- procedure Increment (Item : in out Atomic_Counter) is
- begin
- Increment (Item.Value);
- end Increment;
-
- ----------------
- -- Initialize --
- ----------------
-
- procedure Initialize (Item : out Atomic_Counter) is
- begin
- Item.Value := 1;
- end Initialize;
-
- ------------
- -- Is_One --
- ------------
-
- function Is_One (Item : Atomic_Counter) return Boolean is
- begin
- return Item.Value = 1;
- end Is_One;
-
-end System.Atomic_Counters;