diff options
| author | Giuliano Belinassi <giuliano.belinassi@usp.br> | 2020-08-22 17:43:43 -0300 |
|---|---|---|
| committer | Giuliano Belinassi <giuliano.belinassi@usp.br> | 2020-08-22 17:43:43 -0300 |
| commit | a926878ddbd5a98b272c22171ce58663fc04c3e0 (patch) | |
| tree | 86af256e5d9a9c06263c00adc90e5fe348008c43 /gcc/ada/libgnarl/s-tpoben.adb | |
| parent | 542730f087133690b47e036dfd43eb0db8a650ce (diff) | |
| parent | 07cbaed8ba7d1b6e4ab3a9f44175502a4e1ecdb1 (diff) | |
| download | gcc-devel/autopar_devel.zip gcc-devel/autopar_devel.tar.gz gcc-devel/autopar_devel.tar.bz2 | |
Merge branch 'autopar_rebase2' into autopar_develdevel/autopar_devel
Quickly commit changes in the rebase branch.
Diffstat (limited to 'gcc/ada/libgnarl/s-tpoben.adb')
| -rw-r--r-- | gcc/ada/libgnarl/s-tpoben.adb | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/gcc/ada/libgnarl/s-tpoben.adb b/gcc/ada/libgnarl/s-tpoben.adb index 30fb994..ae06ede 100644 --- a/gcc/ada/libgnarl/s-tpoben.adb +++ b/gcc/ada/libgnarl/s-tpoben.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1998-2019, Free Software Foundation, Inc. -- +-- Copyright (C) 1998-2020, Free Software Foundation, Inc. -- -- -- -- GNARL is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -43,7 +43,6 @@ with System.Task_Primitives.Operations; with System.Restrictions; -with System.Parameters; with System.Tasking.Initialization; pragma Elaborate_All (System.Tasking.Initialization); @@ -53,7 +52,6 @@ package body System.Tasking.Protected_Objects.Entries is package STPO renames System.Task_Primitives.Operations; - use Parameters; use Task_Primitives.Operations; ---------------- @@ -81,10 +79,6 @@ package body System.Tasking.Protected_Objects.Entries is STPO.Write_Lock (Object.L'Unrestricted_Access, Ceiling_Violation); - if Single_Lock then - Lock_RTS; - end if; - if Ceiling_Violation then -- Dip our own priority down to ceiling of lock. See similar code in @@ -95,21 +89,12 @@ package body System.Tasking.Protected_Objects.Entries is Self_ID.New_Base_Priority := Object.Ceiling; Initialization.Change_Base_Priority (Self_ID); STPO.Unlock (Self_ID); - - if Single_Lock then - Unlock_RTS; - end if; - STPO.Write_Lock (Object.L'Unrestricted_Access, Ceiling_Violation); if Ceiling_Violation then raise Program_Error with "ceiling violation"; end if; - if Single_Lock then - Lock_RTS; - end if; - Object.Old_Base_Priority := Old_Base_Priority; Object.Pending_Action := True; end if; @@ -133,13 +118,7 @@ package body System.Tasking.Protected_Objects.Entries is end loop; Object.Finalized := True; - - if Single_Lock then - Unlock_RTS; - end if; - STPO.Unlock (Object.L'Unrestricted_Access); - STPO.Finalize_Lock (Object.L'Unrestricted_Access); end Finalize; |