aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Celier <celier@adacore.com>2014-10-31 11:47:11 +0000
committerArnaud Charlet <charlet@gcc.gnu.org>2014-10-31 12:47:11 +0100
commitaed24d9d740b854c8048d58b9a768a100a25868f (patch)
treeaf84e2891625a3875852f0abe5f7c72b92f991b7
parent715e529d70b264c2392fab72bb4b17ec18fb93fd (diff)
downloadgcc-aed24d9d740b854c8048d58b9a768a100a25868f.zip
gcc-aed24d9d740b854c8048d58b9a768a100a25868f.tar.gz
gcc-aed24d9d740b854c8048d58b9a768a100a25868f.tar.bz2
prj-proc.adb (Recursive_Process): Make sure that the project display name is never No_Name.
2014-10-31 Vincent Celier <celier@adacore.com> * prj-proc.adb (Recursive_Process): Make sure that the project display name is never No_Name. From-SVN: r216970
-rw-r--r--gcc/ada/ChangeLog5
-rw-r--r--gcc/ada/prj-proc.adb10
2 files changed, 14 insertions, 1 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 96f94e2..482f230 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-31 Vincent Celier <celier@adacore.com>
+
+ * prj-proc.adb (Recursive_Process): Make sure that the project
+ display name is never No_Name.
+
2014-10-31 Ed Schonberg <schonberg@adacore.com>
* sem_attr.adb (Analyze_Access_Attribute): Do not emit error
diff --git a/gcc/ada/prj-proc.adb b/gcc/ada/prj-proc.adb
index 9eb2814..7fffc32 100644
--- a/gcc/ada/prj-proc.adb
+++ b/gcc/ada/prj-proc.adb
@@ -2994,7 +2994,15 @@ package body Prj.Proc is
Processed_Projects.Set (Name, Project);
Project.Name := Name;
- Project.Display_Name := Name_Node.Display_Name;
+
+ -- Make sure that the project display name is never No_Name
+
+ if Name_Node.Display_Name = No_Name then
+ Project.Display_Name := Name;
+ else
+ Project.Display_Name := Name_Node.Display_Name;
+ end if;
+
Get_Name_String (Name);
-- If name starts with the virtual prefix, flag the project as