[COMMITTED 6/8] ada: Tweak test for predefined units in binder

[Marc Poulhiès]

From: Ronan Desplanques <desplanq...@adacore.com>

The new way makes better use of the existing abstractions.

gcc/ada/ChangeLog:

        * bindgen.adb (Gen_Elab_Calls): Tweak test.
        (Gen_Elab_Externals): Likewise.

Tested on x86_64-pc-linux-gnu, committed on master.

---
 gcc/ada/bindgen.adb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/gcc/ada/bindgen.adb b/gcc/ada/bindgen.adb
index 57c97d966c9..ac29a463800 100644
--- a/gcc/ada/bindgen.adb
+++ b/gcc/ada/bindgen.adb
@@ -24,7 +24,6 @@
 ------------------------------------------------------------------------------
 
 with Casing;   use Casing;
-with Fname;    use Fname;
 with Gnatvsn;  use Gnatvsn;
 with Hostparm;
 with Namet;    use Namet;
@@ -1539,7 +1538,7 @@ package body Bindgen is
 
             --  Nothing to do if predefined unit in no run time mode
 
-            if No_Run_Time_Mode and then Is_Predefined_File_Name (U.Sfile) then
+            if No_Run_Time_Mode and then U.Predefined then
                null;
 
             --  Likewise if this is an interface to a stand alone library
@@ -1724,9 +1723,7 @@ package body Bindgen is
               --  Don't generate reference for predefined file in No_Run_Time
               --  mode, since we don't include the object files in this case
 
-              and then not
-                (No_Run_Time_Mode
-                  and then Is_Predefined_File_Name (U.Sfile))
+              and then not (No_Run_Time_Mode and then U.Predefined)
             then
                Get_Name_String (U.Sfile);
                Set_String ("   ");
-- 
2.43.0