diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2012-12-05 11:35:24 +0100 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2012-12-05 11:35:24 +0100 |
| commit | e8e581cd1971c7e86a7f06ac84e562e3d278f5e4 (patch) | |
| tree | caa42aac6d7c84e97df5ac473685b58f3f10a81e /gcc/ada/make.adb | |
| parent | 42fc9a7f08f7762b2055e563eeecac81c794b457 (diff) | |
| download | gcc-e8e581cd1971c7e86a7f06ac84e562e3d278f5e4.zip gcc-e8e581cd1971c7e86a7f06ac84e562e3d278f5e4.tar.gz gcc-e8e581cd1971c7e86a7f06ac84e562e3d278f5e4.tar.bz2 | |
[multiple changes]
2012-12-05 Ed Schonberg <schonberg@adacore.com>
* sem_ch5.adb (Preanalyze_Range): If the expression, which
denotes some domain of iteration, has a type with implicit
dereference, and does not have any iterable aspects, insert
dereference to obtain proper container type.
2012-12-05 Bob Duff <duff@adacore.com>
* par-ch8.adb (P_Use_Type_Clause): Fix the Sloc for "use all type ..."
to point to "use".
2012-12-05 Arnaud Charlet <charlet@adacore.com>
* make.adb (Compile): Always pass -x adascil in CodePeer mode.
From-SVN: r194198
Diffstat (limited to 'gcc/ada/make.adb')
| -rw-r--r-- | gcc/ada/make.adb | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/gcc/ada/make.adb b/gcc/ada/make.adb index 2867425..c54debf 100644 --- a/gcc/ada/make.adb +++ b/gcc/ada/make.adb @@ -704,6 +704,7 @@ package body Make is Output_Flag : constant String_Access := new String'("-o"); Ada_Flag_1 : constant String_Access := new String'("-x"); Ada_Flag_2 : constant String_Access := new String'("ada"); + AdaSCIL_Flag : constant String_Access := new String'("adascil"); No_gnat_adc : constant String_Access := new String'("-gnatA"); GNAT_Flag : constant String_Access := new String'("-gnatpg"); Do_Not_Check_Flag : constant String_Access := new String'("-x"); @@ -2989,8 +2990,16 @@ package body Make is -- Now check if the file name has one of the suffixes familiar to -- the gcc driver. If this is not the case then add the ada flag -- "-x ada". + -- Append systematically "-x adascil" in CodePeer mode instead, to + -- force the use of gnat1scil instead of gnat1. - if not Ada_File_Name (S) and then not Targparm.AAMP_On_Target then + if CodePeer_Mode then + Comp_Last := Comp_Last + 1; + Comp_Args (Comp_Last) := Ada_Flag_1; + Comp_Last := Comp_Last + 1; + Comp_Args (Comp_Last) := AdaSCIL_Flag; + + elsif not Ada_File_Name (S) and then not Targparm.AAMP_On_Target then Comp_Last := Comp_Last + 1; Comp_Args (Comp_Last) := Ada_Flag_1; Comp_Last := Comp_Last + 1; |