[gcc/devel/omp/gcc-9] re PR ada/80590 (non-bootstrap build failure of Ada runtime)

[Tobias Burnus]

https://gcc.gnu.org/g:ab4fb49500429ff2f0222c8bbd2d78f99e53087a

commit ab4fb49500429ff2f0222c8bbd2d78f99e53087a
Author: Arnaud Charlet <charlet@adacore.com>
Date:   Mon Jun 17 07:35:02 2019 +0000

    re PR ada/80590 (non-bootstrap build failure of Ada runtime)
    
    PR ada/80590
    
    	* exp_ch9.adb (Expand_N_Delay_Relative_Statement): Swap the two
    	conditions to avoid a unnecessary exception propagation in the default
    	case.
    
    From-SVN: r272374

Diff:
---
 gcc/ada/ChangeLog   |  8 ++++++++
 gcc/ada/exp_ch9.adb | 15 +++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index c40dccd..25b03e5 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,11 @@
+2019-06-17  Arnaud Charlet  <charlet@adacore.com>
+
+PR ada/80590
+
+	* exp_ch9.adb (Expand_N_Delay_Relative_Statement): Swap the two
+	conditions to avoid a unnecessary exception propagation in the default
+	case.
+
 2019-05-28  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gcc-interface/trans.c (lvalue_required_for_attribute_p): Return 0
diff --git a/gcc/ada/exp_ch9.adb b/gcc/ada/exp_ch9.adb
index 5ec9fb4..a3785d7 100644
--- a/gcc/ada/exp_ch9.adb
+++ b/gcc/ada/exp_ch9.adb
@@ -8258,18 +8258,17 @@ package body Exp_Ch9 is
       Proc : Entity_Id;
 
    begin
-      --  Try to use System.Relative_Delays.Delay_For only if available. This
-      --  is the implementation used on restricted platforms when Ada.Calendar
-      --  is not available.
+      --  Try to use Ada.Calendar.Delays.Delay_For if available.
 
-      if RTE_Available (RO_RD_Delay_For) then
-         Proc := RTE (RO_RD_Delay_For);
+      if RTE_Available (RO_CA_Delay_For) then
+         Proc := RTE (RO_CA_Delay_For);
 
-      --  Otherwise, use Ada.Calendar.Delays.Delay_For and emit an error
-      --  message if not available.
+      --  Otherwise, use System.Relative_Delays.Delay_For and emit an error
+      --  message if not available. This is the implementation used on
+      --  restricted platforms when Ada.Calendar is not available.
 
       else
-         Proc := RTE (RO_CA_Delay_For);
+         Proc := RTE (RO_RD_Delay_For);
       end if;
 
       Rewrite (N,