From: Vincent Celier <celier@adacore.com>
Date: Thu, 16 Jun 2005 08:44:23 +0000 (+0200)
Subject: prj-nmsc.adb (Suffix_For): Change default suffix for C++ to ".cpp"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=88664966ce2f31c5200f94b0a45c6abe2d41de1f;p=gcc.git

prj-nmsc.adb (Suffix_For): Change default suffix for C++ to ".cpp"

2005-06-14  Vincent Celier  <celier@adacore.com>

	* prj-nmsc.adb (Suffix_For): Change default suffix for C++ to ".cpp"
	(Check_Stand_Alone_Library): If the specified reference symbol file does
	not exist, only issue a warning when the symbol policy is not
	Controlled. And, when symbol policy is Compliant, set the symbol
	policy to Autonomous.

From-SVN: r101053
---

diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb
index fcdaf67c251..8feea85b3c8 100644
--- a/gcc/ada/prj-nmsc.adb
+++ b/gcc/ada/prj-nmsc.adb
@@ -2460,10 +2460,33 @@ package body Prj.Nmsc is
                   Get_Name_String (Lib_Ref_Symbol_File.Value))
                then
                   Error_Msg_Name_1 := Lib_Ref_Symbol_File.Value;
-                  Error_Msg
-                    (Project, In_Tree,
-                     "library reference symbol file { does not exist",
-                     Lib_Ref_Symbol_File.Location);
+
+                  --  For controlled symbol policy, it is an error
+                  --  if the reference symbol file does not exist.
+
+                  if Data.Symbol_Data.Symbol_Policy = Controlled then
+                     Error_Msg
+                       (Project, In_Tree,
+                        "library reference symbol file { does not exist",
+                        Lib_Ref_Symbol_File.Location);
+
+                  else
+                     --  For other symbol policies, this is just a warning
+
+                     Error_Msg
+                       (Project, In_Tree,
+                        "?library reference symbol file { does not exist",
+                        Lib_Ref_Symbol_File.Location);
+
+                     --  In addition, if symbol policy is Compliant, it is
+                     --  changed to Autonomous, because there is no reference
+                     --  to check against, and we don't want to fail in this
+                     --  case.
+
+                     if Data.Symbol_Data.Symbol_Policy = Compliant then
+                        Data.Symbol_Data.Symbol_Policy := Autonomous;
+                     end if;
+                  end if;
                end if;
 
             end if;
@@ -5069,7 +5092,7 @@ package body Prj.Nmsc is
                Add_Str_To_Name_Buffer (".c");
 
             when C_Plus_Plus_Language_Index =>
-               Add_Str_To_Name_Buffer (".cc");
+               Add_Str_To_Name_Buffer (".cpp");
 
             when others =>
                return No_Name;