aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada/make.adb
diff options
context:
space:
mode:
authorArnaud Charlet <charlet@gcc.gnu.org>2012-07-30 17:17:50 +0200
committerArnaud Charlet <charlet@gcc.gnu.org>2012-07-30 17:17:50 +0200
commitea2af26ac9d3ed57ffbd4ae28538c8f51ba63536 (patch)
treecc310e9db2f48762bb7ae1fb5ca93405bbe61466 /gcc/ada/make.adb
parent29ba9f52eee2ab585349ba71850bf9e0e5c86d3c (diff)
downloadgcc-ea2af26ac9d3ed57ffbd4ae28538c8f51ba63536.zip
gcc-ea2af26ac9d3ed57ffbd4ae28538c8f51ba63536.tar.gz
gcc-ea2af26ac9d3ed57ffbd4ae28538c8f51ba63536.tar.bz2
[multiple changes]
2012-07-30 Hristian Kirtchev <kirtchev@adacore.com> * sem_ch12.adb (Earlier): Add local variables T1 and T2. Minor code refactoring. 2012-07-30 Thomas Quinot <quinot@adacore.com> * gnatcmd.adb, make.adb, makeutl.adb, makeutl.ads (Test_If_Relative_Path): Rename to Ensure_Absolute_Path to better reflect what this subprogram does. Rename argument Including_L_Switch to For_Gnatbind, and also exempt -A from rewriting. * bindusg.adb: Document optional =file argument to gnatbind -A. 2012-07-30 Ed Schonberg <schonberg@adacore.com> * freeze.adb (Freeze_Entity): Do no apply restriction check on storage pools to access to subprogram types. From-SVN: r189978
Diffstat (limited to 'gcc/ada/make.adb')
-rw-r--r--gcc/ada/make.adb30
1 files changed, 15 insertions, 15 deletions
diff --git a/gcc/ada/make.adb b/gcc/ada/make.adb
index 0eed65d..d45ee14 100644
--- a/gcc/ada/make.adb
+++ b/gcc/ada/make.adb
@@ -2366,7 +2366,7 @@ package body Make is
Last_New := Last_New + 1;
New_Args (Last_New) :=
new String'(Name_Buffer (1 .. Name_Len));
- Test_If_Relative_Path
+ Ensure_Absolute_Path
(New_Args (Last_New),
Do_Fail => Make_Failed'Access,
Parent => Dir_Path,
@@ -2399,7 +2399,7 @@ package body Make is
Directory.Display_Name);
begin
- Test_If_Relative_Path
+ Ensure_Absolute_Path
(New_Args (1),
Do_Fail => Make_Failed'Access,
Parent => Dir_Path,
@@ -5028,36 +5028,36 @@ package body Make is
Get_Name_String (Main_Project.Directory.Display_Name);
begin
for J in 1 .. Binder_Switches.Last loop
- Test_If_Relative_Path
+ Ensure_Absolute_Path
(Binder_Switches.Table (J),
Do_Fail => Make_Failed'Access,
- Parent => Dir_Path, Including_L_Switch => False);
+ Parent => Dir_Path, For_Gnatbind => True);
end loop;
for J in 1 .. Saved_Binder_Switches.Last loop
- Test_If_Relative_Path
+ Ensure_Absolute_Path
(Saved_Binder_Switches.Table (J),
- Do_Fail => Make_Failed'Access,
- Parent => Current_Work_Dir,
- Including_L_Switch => False);
+ Do_Fail => Make_Failed'Access,
+ Parent => Current_Work_Dir,
+ For_Gnatbind => True);
end loop;
for J in 1 .. Linker_Switches.Last loop
- Test_If_Relative_Path
+ Ensure_Absolute_Path
(Linker_Switches.Table (J),
Parent => Dir_Path,
Do_Fail => Make_Failed'Access);
end loop;
for J in 1 .. Saved_Linker_Switches.Last loop
- Test_If_Relative_Path
+ Ensure_Absolute_Path
(Saved_Linker_Switches.Table (J),
Do_Fail => Make_Failed'Access,
Parent => Current_Work_Dir);
end loop;
for J in 1 .. Gcc_Switches.Last loop
- Test_If_Relative_Path
+ Ensure_Absolute_Path
(Gcc_Switches.Table (J),
Do_Fail => Make_Failed'Access,
Parent => Dir_Path,
@@ -5065,7 +5065,7 @@ package body Make is
end loop;
for J in 1 .. Saved_Gcc_Switches.Last loop
- Test_If_Relative_Path
+ Ensure_Absolute_Path
(Saved_Gcc_Switches.Table (J),
Parent => Current_Work_Dir,
Do_Fail => Make_Failed'Access,
@@ -5387,14 +5387,14 @@ package body Make is
Get_Name_String (Main_Project.Directory.Display_Name);
begin
for J in Last_Binder_Switch + 1 .. Binder_Switches.Last loop
- Test_If_Relative_Path
+ Ensure_Absolute_Path
(Binder_Switches.Table (J),
Do_Fail => Make_Failed'Access,
- Parent => Dir_Path, Including_L_Switch => False);
+ Parent => Dir_Path, For_Gnatbind => True);
end loop;
for J in Last_Linker_Switch + 1 .. Linker_Switches.Last loop
- Test_If_Relative_Path
+ Ensure_Absolute_Path
(Linker_Switches.Table (J),
Parent => Dir_Path,
Do_Fail => Make_Failed'Access);