From 50421527ecf401ca7668048d0fe599bd043f776f Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Fri, 30 Mar 2012 11:15:22 +0200 Subject: [PATCH] [multiple changes] 2012-03-30 Vincent Celier * prj.ads: New Dependency_Kind: ALI_Closure. 2012-03-30 Thomas Quinot * exp_pakd.adb: Minor reformatting. From-SVN: r185998 --- gcc/ada/ChangeLog | 8 ++++++++ gcc/ada/exp_pakd.adb | 12 ++++++------ gcc/ada/prj.adb | 2 +- gcc/ada/prj.ads | 4 ++-- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 2a09d66461f..79cbb4a3b46 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,11 @@ +2012-03-30 Vincent Celier + + * prj.ads: New Dependency_Kind: ALI_Closure. + +2012-03-30 Thomas Quinot + + * exp_pakd.adb: Minor reformatting. + 2012-03-30 Yannick Moy * lib-xref-alfa.adb (Add_Alfa_File): Take into account possible absence diff --git a/gcc/ada/exp_pakd.adb b/gcc/ada/exp_pakd.adb index 8a95ec5c876..756a3d19be3 100644 --- a/gcc/ada/exp_pakd.adb +++ b/gcc/ada/exp_pakd.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2011, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2012, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -509,7 +509,7 @@ package body Exp_Pakd is Shift : out Node_Id); -- This procedure performs common processing on the N_Indexed_Component -- parameter given as N, whose prefix is a reference to a packed array. - -- This is used for the get and set when the component size is 1,2,4 + -- This is used for the get and set when the component size is 1, 2, 4, -- or for other component sizes when the packed array type is a modular -- type (i.e. the cases that are handled with inline code). -- @@ -1472,10 +1472,10 @@ package body Exp_Pakd is end if; end if; - -- Now create copies removing side effects. Note that in some - -- complex cases, this may cause the fact that we have already - -- set a packed array type on Obj to get lost. So we save the - -- type of Obj, and make sure it is reset properly. + -- Now create copies removing side effects. Note that in some complex + -- cases, this may cause the fact that we have already set a packed + -- array type on Obj to get lost. So we save the type of Obj, and + -- make sure it is reset properly. declare T : constant Entity_Id := Etype (Obj); diff --git a/gcc/ada/prj.adb b/gcc/ada/prj.adb index c8c5958aad5..9a5e2607aa1 100644 --- a/gcc/ada/prj.adb +++ b/gcc/ada/prj.adb @@ -296,7 +296,7 @@ package body Prj is when Makefile => return Extend_Name (Source_File_Name, Makefile_Dependency_Suffix); - when ALI_File => + when ALI_File | ALI_Closure => return Extend_Name (Source_File_Name, ALI_Dependency_Suffix); end case; end Dependency_Name; diff --git a/gcc/ada/prj.ads b/gcc/ada/prj.ads index 877d1b59b39..867bf352457 100644 --- a/gcc/ada/prj.ads +++ b/gcc/ada/prj.ads @@ -298,9 +298,9 @@ package Prj is -- Type for the kind of language. All languages are file based, except Ada -- which is unit based. - type Dependency_File_Kind is (None, Makefile, ALI_File); + type Dependency_File_Kind is (None, Makefile, ALI_File, ALI_Closure); -- Type of dependency to be checked: no dependency file, Makefile fragment - -- or ALI file (for Ada). + -- or ALI file (for Ada). Please comment ALI_Closure ??? Makefile_Dependency_Suffix : constant String := ".d"; ALI_Dependency_Suffix : constant String := ".ali"; -- 2.30.2