diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2011-12-12 12:52:04 +0100 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2011-12-12 12:52:04 +0100 |
| commit | fe58fea70b2614f36fb9e1fde78af892426ad8a6 (patch) | |
| tree | 47e75a0a07789fbe0929f7955dd7427cfbfb0c0b /gcc/ada/gnatls.adb | |
| parent | ee1a757231c05815f7e2f9e5e0ced98b380c0416 (diff) | |
| download | gcc-fe58fea70b2614f36fb9e1fde78af892426ad8a6.zip gcc-fe58fea70b2614f36fb9e1fde78af892426ad8a6.tar.gz gcc-fe58fea70b2614f36fb9e1fde78af892426ad8a6.tar.bz2 | |
[multiple changes]
2011-12-12 Gary Dismukes <dismukes@adacore.com>
* freeze.adb (Freeze_Expression): Allow freezing of static
scalar subtypes that are prefixes of an attribute, even if not
yet marked static. Such attributes will get marked as static
later in Eval_Attribute (as called from Resolve_Attribute).
* sem_attr.adb (Eval_Attribute): Remove wrong code that does an
early return for attribute prefixes that are unfrozen source-level
types. This code was incorrectly bypassing folding of unfrozen
static subtype attributes in default expressions (the executable
example in the now-deleted comment was in fact illegal).
2011-12-12 Robert Dewar <dewar@adacore.com>
* a-coinve.adb, sem_res.adb, prj-nmsc.adb, a-cobove.adb, a-convec.adb,
gnatls.adb, sem_ch13.adb, prj-env.adb, prj-env.ads: Minor reformatting.
2011-12-12 Tristan Gingold <gingold@adacore.com>
* gsocket.h: Adjust previous patch.
From-SVN: r182228
Diffstat (limited to 'gcc/ada/gnatls.adb')
| -rw-r--r-- | gcc/ada/gnatls.adb | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/gcc/ada/gnatls.adb b/gcc/ada/gnatls.adb index ac00ec8..a1d0e8d 100644 --- a/gcc/ada/gnatls.adb +++ b/gcc/ada/gnatls.adb @@ -1186,10 +1186,11 @@ procedure Gnatls is procedure Search_RTS (Name : String) is Src_Path : String_Ptr; Lib_Path : String_Ptr; - -- Pathes for source and include subdirs + -- Paths for source and include subdirs Rts_Full_Path : String_Access; -- Full path for RTS project + begin -- Try to find the RTS @@ -1207,32 +1208,32 @@ procedure Gnatls is if Lib_Path /= null then Osint.Fail ("RTS path not valid: missing adainclude directory"); - elsif Src_Path /= null then Osint.Fail ("RTS path not valid: missing adalib directory"); - end if; - -- Try to find the RTS on the project path. First setup the project - -- path. + -- Try to find the RTS on the project path. First setup the project path Initialize_Default_Project_Path (Prj_Path, Target_Name => Sdefault.Target_Name.all); Rts_Full_Path := Get_Runtime_Path (Prj_Path, Name); + if Rts_Full_Path /= null then + -- Directory name was found on the project path. Look for the -- include subdir(s). - Src_Path := Get_RTS_Search_Dir (Name, Include); + Src_Path := Get_RTS_Search_Dir (Rts_Full_Path.all, Include); + if Src_Path /= null then Add_Search_Dirs (Src_Path, Include); return; end if; end if; - Osint.Fail ("RTS path not valid: missing " & - "adainclude and adalib directories"); + Osint.Fail + ("RTS path not valid: missing adainclude and adalib directories"); end Search_RTS; ------------------- |