diff options
author | Arnaud Charlet <charlet@gcc.gnu.org> | 2014-01-24 15:23:03 +0100 |
---|---|---|
committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2014-01-24 15:23:03 +0100 |
commit | 7610fee82af0217dd376ce0213d195209f72b606 (patch) | |
tree | 9c66fd5109d2f7bfc6e07d67646d74a2c885dbf7 /gcc/ada/prj-nmsc.adb | |
parent | 4a8548473e9241313033cbd0ff3e37ab1f6971fe (diff) | |
download | gcc-7610fee82af0217dd376ce0213d195209f72b606.zip gcc-7610fee82af0217dd376ce0213d195209f72b606.tar.gz gcc-7610fee82af0217dd376ce0213d195209f72b606.tar.bz2 |
[multiple changes]
2014-01-24 Doug Rupp <rupp@adacore.com>
* init.c: Add a handler section for Android.
2014-01-24 Arnaud Charlet <charlet@adacore.com>
* i-cexten.ads (Unsigned_33..64, Unsigned_33..64): New types.
2014-01-24 Ed Schonberg <schonberg@adacore.com>
* sem_ch4.adb (Operator_Check): If one operand is a
Raise_Expression, set its type to that of the other operand.
* sem_res.adb (Resolve_Raise_Expression): new procedure.
(Resolve_Actuals): For an actual that is a Raise_Expression,
set the type to that of the formal.
* sem_type.adb (Find_Unique_Type): If one of the operands is a
Raise_Expression, return type of the other operand.
2014-01-24 Ed Schonberg <schonberg@adacore.com>
* sem_aggr.adb (Resolve_Record_Aggregate): If a scalar
component of the record has a type with a default aspect, and
the corresponding aggregate component is initiaized with a box,
use the default value in the rewritten aggregate.
2014-01-24 Tristan Gingold <gingold@adacore.com>
* s-interr.ads, s-interr.adb, s-interr-hwint.adb, s-interr-vms.adb,
s-interr-sigaction.adb,
s-interr-dummy.adb (Install_Restricted_Handlers): Add Prio parameter.
* exp_ch9.adb (Make_Initialize_Protection): Add Prio parameter
to the call to Install_Restricted_Handlers.
2014-01-24 Emmanuel Briot <briot@adacore.com>
* prj-nmsc.adb (Check_File): Add protection when the source is
not fully initialized.
From-SVN: r207033
Diffstat (limited to 'gcc/ada/prj-nmsc.adb')
-rw-r--r-- | gcc/ada/prj-nmsc.adb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb index 54c4e4e..e6a1f4c 100644 --- a/gcc/ada/prj-nmsc.adb +++ b/gcc/ada/prj-nmsc.adb @@ -7051,7 +7051,9 @@ package body Prj.Nmsc is -- Check if it is OK to have the same file name in several -- source directories. - if Source_Dir_Rank = Name_Loc.Source.Source_Dir_Rank then + if Name_Loc.Source /= No_Source + and then Source_Dir_Rank = Name_Loc.Source.Source_Dir_Rank + then Error_Msg_File_1 := File_Name; Error_Msg (Data.Flags, |