From: charlet Date: Fri, 31 Oct 2014 11:47:11 +0000 (+0000) Subject: 2014-10-31 Vincent Celier X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eca9489da83767a445c92b8b9f0c3009eef7abcf;p=thirdparty%2Fgcc.git 2014-10-31 Vincent Celier * prj-proc.adb (Recursive_Process): Make sure that the project display name is never No_Name. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@216970 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 96f94e2f2478..482f230e0d96 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2014-10-31 Vincent Celier + + * prj-proc.adb (Recursive_Process): Make sure that the project + display name is never No_Name. + 2014-10-31 Ed Schonberg * 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 9eb281468e43..7fffc3210f55 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