diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-05-22 12:42:05 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-05-22 12:42:05 +0000 |
| commit | 116afa8e14569ca77eede86685eb4817593b230b (patch) | |
| tree | 35d7ac1037a5211f5a217b67c5f16e70ebeb113c /gcc/ada/prj.ads | |
| parent | 126fecaec854c82ceade869c7f3d96251810b791 (diff) | |
| download | gcc-116afa8e14569ca77eede86685eb4817593b230b.tar.gz | |
2015-05-22 Ed Schonberg <schonberg@adacore.com>
* einfo.ads, einfo.adb (Incomplete_Actuals): New attribute of
package instantiations. Holds the list of actuals in the instance
that are incomplete types, to determine where the corresponding
instance body must be placed.
* sem_ch6.adb (Conforming_Types): An incomplete type used as an
actual in an instance matches an incomplete formal.
* sem_disp.adb (Check_Dispatching_Call): Handle missing case of
explicit dereference.
(Inherited_Subprograms): In the presence of a limited view there
are no subprograms to inherit.
* sem_ch12.adb (Preanalyze_Actuals): Build list of incomplete
actuals of instance, for later placement of instance body and
freeze nodes for actuals.
(Install_Body): In the presence of actuals that incomplete types
from a limited view, the instance body cannot be placed after
the declaration because full views have not been seen yet. Any
use of the non-limited views in the instance body requires
the presence of a regular with_clause in the enclosing unit,
and will fail if this with_clause is missing. We place the
instance body at the beginning of the enclosing body, which is
the unit being compiled, and ensure that freeze nodes for the
full views of the incomplete types appear before the instance.
2015-05-22 Pascal Obry <obry@adacore.com>
* makeutl.ads, prj-conf.adb, prj-nmsc.adb, prj.ads
(In_Place_Option): Removed.
(Relocate_Build_Tree_Option): New constant.
(Root_Dir_Option): New constant.
(Obj_Root_Dir): Removed.
(Build_Tree_Dir): New variable.
(Root_Src_Tree): Removed.
(Root_Dir): New variable.
* prj-conf.adb (Get_Or_Create_Configuration_File): Add check
for improper relocation.
* prj-nmsc.adb (Locate_Directory): Add check for improper
relocation.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223553 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/prj.ads')
| -rw-r--r-- | gcc/ada/prj.ads | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/gcc/ada/prj.ads b/gcc/ada/prj.ads index 4910331c484..29a718eb04b 100644 --- a/gcc/ada/prj.ads +++ b/gcc/ada/prj.ads @@ -61,16 +61,14 @@ package Prj is -- The value after the equal sign in switch --subdirs=... -- Contains the relative subdirectory. - Obj_Root_Dir : String_Ptr := null; + Build_Tree_Dir : String_Ptr := null; -- A root directory for building out-of-tree projects. All relative object - -- directories will be rooted at this location. If Subdirs is also set it - -- will be added at the end too. + -- directories will be rooted at this location. - Root_Src_Tree : String_Ptr := null; + Root_Dir : String_Ptr := null; -- When using out-of-tree build we need to keep information about the root - -- directory source tree to properly relocate all projects to this root - -- directory. Note that the root source directory is not necessary the - -- directory of the main project. + -- directory of artifacts to properly relocate them. Note that the root + -- directory is not necessary the directory of the main project. type Library_Support is (None, Static_Only, Full); -- Support for Library Project File. |