diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/make.adb | 7 | ||||
| -rw-r--r-- | gcc/ada/prj-nmsc.adb | 4 | ||||
| -rw-r--r-- | gcc/ada/prj-proc.adb | 1 |
3 files changed, 9 insertions, 3 deletions
diff --git a/gcc/ada/make.adb b/gcc/ada/make.adb index 71f95c4..9c11556 100644 --- a/gcc/ada/make.adb +++ b/gcc/ada/make.adb @@ -6127,6 +6127,13 @@ package body Make is Osint.Add_File (Get_Name_String (Sfile)); Put_In_Q := True; + + -- As we may look into the Q later, ensure the Q has been + -- initialized to avoid errors. + + if First_Q_Initialization then + Init_Q; + end if; end if; end loop; end Insert_Project_Sources; diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb index c51fbd5..6c814a9 100644 --- a/gcc/ada/prj-nmsc.adb +++ b/gcc/ada/prj-nmsc.adb @@ -606,9 +606,9 @@ package body Prj.Nmsc is Naming : Naming_Data) is begin - -- Only check if we are not using the standard naming scheme + -- Only check if we are not using the Default naming scheme - if Naming /= Standard_Naming_Data then + if Naming /= In_Tree.Private_Part.Default_Naming then declare Dot_Replacement : constant String := Get_Name_String diff --git a/gcc/ada/prj-proc.adb b/gcc/ada/prj-proc.adb index c67f2a3..ed3a8b9 100644 --- a/gcc/ada/prj-proc.adb +++ b/gcc/ada/prj-proc.adb @@ -2202,7 +2202,6 @@ package body Prj.Proc is Processed_Data.Directory := Name_Find; Processed_Data.Extended_By := Extended_By; - Processed_Data.Naming := Standard_Naming_Data; Add_Attributes (Project, In_Tree, Processed_Data.Decl, Attribute_First); |