diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2010-09-10 15:53:51 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2010-09-10 15:53:51 +0200 |
| commit | a113c55d5aaa0764c6455405f3235abe14a74320 (patch) | |
| tree | da363269b7e9c22cabda04b9e23777bcc7a1589d /gcc/ada/errout.adb | |
| parent | 0856403616ac03ee6eb8cd2cb83f1e7274f9f909 (diff) | |
| download | gcc-a113c55d5aaa0764c6455405f3235abe14a74320.zip gcc-a113c55d5aaa0764c6455405f3235abe14a74320.tar.gz gcc-a113c55d5aaa0764c6455405f3235abe14a74320.tar.bz2 | |
[multiple changes]
2010-09-10 Vincent Celier <celier@adacore.com>
* vms_data.ads: Add new GNAT BIND qualifiers /32_MALLOC (for -H32) and
/64_MALLOC (for -H64).
2010-09-10 Robert Dewar <dewar@adacore.com>
* errout.adb (Error_Msg_Internal): Test Parsing_Main_Subunit flag
(Error_Msg_NW): Test Parsing_Main_Subunit flag
* errout.ads (Parsing_Main_Subunit): New flag
* lib-load.adb (Load_Unit): Set Parsing_Main_Subunit flag
* par-ch6.adb: Minor style fix (remove redandant parentheses)
* par-ch9.adb: Minor style fix (remove redundant parens)
* par-load.adb: (Load): Deal with setting Parsing_Main_Subunit
2010-09-10 Vincent Celier <celier@adacore.com>
* make.adb (Create_Binder_Mapping_File): Remove procedure. Replaced by
function of the same name in Makeutl.
(Gnatmake): Call function Create_Binder_Mapping_File in Makeutl, instead
of removed procedure when creating a binder mapping file.
* makeutl.adb (Create_Binder_Mapping_File): New function. Was a
procedure in Make.
* makeutl.ads (Create_Binder_Mapping_File): New function
From-SVN: r164176
Diffstat (limited to 'gcc/ada/errout.adb')
| -rw-r--r-- | gcc/ada/errout.adb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gcc/ada/errout.adb b/gcc/ada/errout.adb index 26cfc6f..d3701cb 100644 --- a/gcc/ada/errout.adb +++ b/gcc/ada/errout.adb @@ -748,7 +748,9 @@ package body Errout is -- If the flag location is in the main extended source unit then for -- sure we want the warning since it definitely belongs - if In_Extended_Main_Source_Unit (Sptr) then + if Parsing_Main_Subunit + or else In_Extended_Main_Source_Unit (Sptr) + then null; -- If the flag location is not in the main extended source unit, then @@ -1157,7 +1159,8 @@ package body Errout is is begin if Eflag - and then In_Extended_Main_Source_Unit (N) + and then (Parsing_Main_Subunit + or else In_Extended_Main_Source_Unit (N)) and then Comes_From_Source (N) then Error_Msg_NEL (Msg, N, N, Sloc (N)); |