aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada/make.adb
diff options
context:
space:
mode:
authorArnaud Charlet <charlet@gcc.gnu.org>2011-08-03 17:08:04 +0200
committerArnaud Charlet <charlet@gcc.gnu.org>2011-08-03 17:08:04 +0200
commitf9ad6b6231baeb79e967d1e7f1d1d9a7953453b7 (patch)
tree87091994956cdeda34009c2edcbcb3ab478bbce3 /gcc/ada/make.adb
parent1cdfa9be54975f0566d6f261a706dcb8d767601d (diff)
downloadgcc-f9ad6b6231baeb79e967d1e7f1d1d9a7953453b7.zip
gcc-f9ad6b6231baeb79e967d1e7f1d1d9a7953453b7.tar.gz
gcc-f9ad6b6231baeb79e967d1e7f1d1d9a7953453b7.tar.bz2
[multiple changes]
2011-08-03 Javier Miranda <miranda@adacore.com> * sem_prag.adb (Process_Interface_Name): Allow duplicated export names in Java since they are always enclosed in a namespace that differentiates them, and overloaded entities are supported by the VM. 2011-08-03 Ed Schonberg <schonberg@adacore.com> * checks.adb (Determine_Range): If a computed bound of an operation is outside the range of the base type of the expression, and overflow checks are enabled, the result is unknown and cannot be used for any subsequent constant folding. * sem_eval.adb (Compile_Time_Compare): if the bounds of one operand are unknown, so is the result of the comparison. 2011-08-03 Hristian Kirtchev <kirtchev@adacore.com> * a-except-2005.adb (Raise_From_Controlled_Operation): Add new formal From_Abort. When finalization was triggered by an abort, propagate Standard'Abort_Signal rather than Program_Error. * a-except-2005.ads (Raise_From_Controlled_Operation): Add new formal From_Abort. * a-except.adb (Raise_From_Controlled_Operation): Add new formal From_Abort. When finalization was triggered by an abort, propagate Standard'Abort_Signal rather than Program_Error. * a-except.ads:(Raise_From_Controlled_Operation): Add new formal From_Abort. * exp_ch7.adb:(Build_Adjust_Or_Finalize_Statements): New local variable Abort_Id. Update the calls to Build_Object_Declarations and Build_Raise_Statement to include Abort_Id. (Build_Adjust_Statements): New local variable Abort_Id. Update the calls to Build_Object_Declarations and Build_Raise_Statement to include Abort_Id. (Build_Finalize_Statements): New local variable Abort_Id. Update the calls to Build_Object_Declarations and Build_Raise_Statement to include Abort_Id. (Build_Components): Create an entity for Abort_Id when exceptions are allowed on the target. (Build_Finalizer): New local variable Abort_Id. (Build_Initialize_Statements): New local variable Abort_Id. Update the calls to Build_Object_Declarations and Build_Raise_Statement to include Abort_Id. (Build_Object_Declarations): Add new formal Abort_Id. Create the declaration of flag Abort_Id to preserve the original abort status before finalization code is executed. (Build_Raise_Statement): Add new formal Abort_Id. Pass Abort_Id to runtime routine Raise_From_Controlled_Operation. (Create_Finalizer): Update the call to Build_Raise_Statement to include Abort_Id. Update the call to Build_Object_Declarations to include Abort_Id. Update the layout of the finalizer body. (Make_Handler_For_Ctrl_Operation): Add an actual for From_Abort. (Process_Transient_Objects): New local variable Abort_Id. Remove the clunky code to create all flags and objects related to exception propagation and replace it with a call to Build_Object_Declarations. Update the call to Build_Raise_Statement to include Abort_Id. * exp_ch7.ads (Build_Object_Declarations): Moved from body to spec. Add new formal Abort_Id and associated comment on its use. (Build_Raise_Statement): Add new formal Abort_Id and associated comment on its use. * exp_intr.adb (Expand_Unc_Deallocation): New local variable Abort_Id. Remove the clunky code to create all flags and objects related to exception propagation and replace it with a call to Build_Object_Declarations. Update the call to Build_Raise_Statement. 2011-08-03 Eric Botcazou <ebotcazou@adacore.com> * s-tassta.adb: Fix minor typos. 2011-08-03 Robert Dewar <dewar@adacore.com> * rtsfind.ads, makeutl.ads, prj.ads, prj.adb, make.adb, lib-writ.adb, makeutl.adb, s-soflin.ads, clean.adb: Minor reformatting. From-SVN: r177283
Diffstat (limited to 'gcc/ada/make.adb')
-rw-r--r--gcc/ada/make.adb55
1 files changed, 29 insertions, 26 deletions
diff --git a/gcc/ada/make.adb b/gcc/ada/make.adb
index 6be04b1..c8eabf1 100644
--- a/gcc/ada/make.adb
+++ b/gcc/ada/make.adb
@@ -2313,8 +2313,8 @@ package body Make is
new String'(Name_Buffer (1 .. Name_Len));
Test_If_Relative_Path
(New_Args (Last_New),
- Do_Fail => Make_Failed'Access,
- Parent => Dir_Path,
+ Do_Fail => Make_Failed'Access,
+ Parent => Dir_Path,
Including_Non_Switch => False);
end if;
@@ -2322,10 +2322,9 @@ package body Make is
end loop;
Add_Arguments
- (Configuration_Pragmas_Switch
- (Arguments_Project) &
- New_Args (1 .. Last_New) &
- The_Saved_Gcc_Switches.all);
+ (Configuration_Pragmas_Switch (Arguments_Project)
+ & New_Args (1 .. Last_New)
+ & The_Saved_Gcc_Switches.all);
end;
end;
@@ -2341,8 +2340,8 @@ package body Make is
(Name_Buffer (1 .. Name_Len)));
Dir_Path : constant String :=
Get_Name_String
- (Arguments_Project.
- Directory.Display_Name);
+ (Arguments_Project.
+ Directory.Display_Name);
begin
Test_If_Relative_Path
@@ -2687,11 +2686,11 @@ package body Make is
if Add_It then
if not Queue.Insert
- ((Format => Format_Gnatmake,
- File => Sfile,
- Unit => No_Unit_Name,
- Project => No_Project,
- Index => 0))
+ ((Format => Format_Gnatmake,
+ File => Sfile,
+ Unit => No_Unit_Name,
+ Project => No_Project,
+ Index => 0))
then
if Is_In_Obsoleted (Sfile) then
Executable_Obsolete := True;
@@ -5901,10 +5900,10 @@ package body Make is
-- except those of library projects.
Prj.Env.Set_Ada_Paths
- (Project => Main_Project,
- In_Tree => Project_Tree,
+ (Project => Main_Project,
+ In_Tree => Project_Tree,
Including_Libraries => False,
- Include_Path => Use_Include_Path_File);
+ Include_Path => Use_Include_Path_File);
-- If switch -C was specified, create a binder mapping file
@@ -6051,9 +6050,9 @@ package body Make is
Linker_Switches.Increment_Last;
Linker_Switches.Table (Linker_Switches.Last) :=
new String'("-l" &
- Get_Name_String
- (Library_Projs.Table (Index).
- Library_Name));
+ Get_Name_String
+ (Library_Projs.Table (Index).
+ Library_Name));
end if;
end if;
end loop;
@@ -6421,22 +6420,23 @@ package body Make is
Test_If_Relative_Path
(Binder_Switches.Table (J),
Do_Fail => Make_Failed'Access,
- Parent => Dir_Path, Including_L_Switch => False);
+ Parent => Dir_Path, Including_L_Switch => False);
end loop;
for
J in Last_Linker_Switch + 1 .. Linker_Switches.Last
loop
Test_If_Relative_Path
- (Linker_Switches.Table (J), Parent => Dir_Path,
+ (Linker_Switches.Table (J),
+ Parent => Dir_Path,
Do_Fail => Make_Failed'Access);
end loop;
end;
-- We now put in the Binder_Switches and Linker_Switches
-- tables, the binder and linker switches of the command
- -- line that have been put in the Saved_ tables.
- -- These switches will follow the project file switches.
+ -- line that have been put in the Saved_ tables. These
+ -- switches will follow the project file switches.
for J in 1 .. Saved_Binder_Switches.Last loop
Add_Switch
@@ -6461,6 +6461,7 @@ package body Make is
if Do_Codepeer_Globalize_Step then
declare
Success : Boolean := False;
+
begin
Globalize (Success);
@@ -6732,7 +6733,8 @@ package body Make is
-- Test for trailing -D switch
elsif Object_Directory_Present
- and then not Object_Directory_Seen then
+ and then not Object_Directory_Seen
+ then
Make_Failed ("object directory missing after -D");
end if;
@@ -7382,6 +7384,7 @@ package body Make is
for Next_Arg in 1 .. Argument_Count loop
declare
Argv : constant String := Argument (Next_Arg);
+
begin
if Argv'Length > 2
and then Argv (1) = '-'
@@ -7678,8 +7681,8 @@ package body Make is
elsif Program_Args /= None then
- -- Check to see if we are reading -I switches in order
- -- to take into account in the src & lib search directories.
+ -- Check to see if we are reading -I switches in order to take into
+ -- account in the src & lib search directories.
if Argv'Length > 2 and then Argv (1 .. 2) = "-I" then
if Argv (3 .. Argv'Last) = "-" then