PR ada/52494

[pf3gnuchains/gcc-fork.git] / gcc / ada / mlib-tgt.adb

diff --git a/gcc/ada/mlib-tgt.adb b/gcc/ada/mlib-tgt.adb
index e7cee9e..4d8597c 100644 (file)
--- a/gcc/ada/mlib-tgt.adb
+++ b/gcc/ada/mlib-tgt.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---                     Copyright (C) 2001-2007, AdaCore                     --
+--                     Copyright (C) 2001-2010, AdaCore                     --
 --                                                                          --
 -- GNAT 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- --
@@ -317,7 +317,8 @@ package body MLib.Tgt is
    ------------------------
 
    function Library_Exists_For
-     (Project : Project_Id; In_Tree : Project_Tree_Ref) return Boolean
+     (Project : Project_Id;
+      In_Tree : Project_Tree_Ref) return Boolean
    is
    begin
       return Library_Exists_For_Ptr (Project, In_Tree);
@@ -328,10 +329,13 @@ package body MLib.Tgt is
    --------------------------------
 
    function Library_Exists_For_Default
-     (Project : Project_Id; In_Tree : Project_Tree_Ref) return Boolean
+     (Project : Project_Id;
+      In_Tree : Project_Tree_Ref) return Boolean
    is
+      pragma Unreferenced (In_Tree);
+
    begin
-      if not In_Tree.Projects.Table (Project).Library then
+      if not Project.Library then
          Prj.Com.Fail ("INTERNAL ERROR: Library_Exists_For called " &
                        "for non library project");
          return False;
@@ -339,14 +343,12 @@ package body MLib.Tgt is
       else
          declare
             Lib_Dir  : constant String :=
-                         Get_Name_String
-                           (In_Tree.Projects.Table (Project).Library_Dir);
+                         Get_Name_String (Project.Library_Dir.Display_Name);
             Lib_Name : constant String :=
-                         Get_Name_String
-                           (In_Tree.Projects.Table (Project).Library_Name);
+                         Get_Name_String (Project.Library_Name);
 
          begin
-            if In_Tree.Projects.Table (Project).Library_Kind = Static then
+            if Project.Library_Kind = Static then
                return Is_Regular_File
                  (Lib_Dir & Directory_Separator & "lib" &
                   Fil.Append_To (Lib_Name, Archive_Ext));
@@ -380,8 +382,9 @@ package body MLib.Tgt is
      (Project : Project_Id;
       In_Tree : Project_Tree_Ref) return File_Name_Type
    is
+      pragma Unreferenced (In_Tree);
    begin
-      if not In_Tree.Projects.Table (Project).Library then
+      if not Project.Library then
          Prj.Com.Fail ("INTERNAL ERROR: Library_File_Name_For called " &
                        "for non library project");
          return No_File;
@@ -389,11 +392,10 @@ package body MLib.Tgt is
       else
          declare
             Lib_Name : constant String :=
-                         Get_Name_String
-                           (In_Tree.Projects.Table (Project).Library_Name);
+                         Get_Name_String (Project.Library_Name);
 
          begin
-            if In_Tree.Projects.Table (Project).Library_Kind =
+            if Project.Library_Kind =
                  Static
             then
                Name_Len := 3;
@@ -499,4 +501,5 @@ package body MLib.Tgt is
    begin
       return Full;
    end Support_For_Libraries_Default;
+
 end MLib.Tgt;