summaryrefslogtreecommitdiff
path: root/gcc/ada/makeutl.adb
diff options
context:
space:
mode:
authorcharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2014-07-30 15:01:55 +0000
committercharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2014-07-30 15:01:55 +0000
commitbe72191f12aaf48c83d4c2623e9aa798df8e8a7e (patch)
tree596ec2e35a3dcf2422131c5c69bc15ef43f329c2 /gcc/ada/makeutl.adb
parent97c15ab05ffdb09b2feccf392dce2729c49a7670 (diff)
downloadgcc-be72191f12aaf48c83d4c2623e9aa798df8e8a7e.tar.gz
2014-07-30 Robert Dewar <dewar@adacore.com>
* exp_ch7.adb, checks.adb, makeutl.adb, makeutl.ads: Minor reformatting. 2014-07-30 Yannick Moy <moy@adacore.com> * checks.ads: Fix typo in comment. 2014-07-30 Pierre-Marie Derodat <derodat@adacore.com> * sem_util.adb (Set_Debug_Info_Needed): For scalar types, recurse on entities that materialize range bounds, if any. 2014-07-30 Vincent Celier <celier@adacore.com> * projects.texi: Minor spelling fix. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@213292 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/makeutl.adb')
-rw-r--r--gcc/ada/makeutl.adb19
1 files changed, 8 insertions, 11 deletions
diff --git a/gcc/ada/makeutl.adb b/gcc/ada/makeutl.adb
index 51f95692f76..88826c73af8 100644
--- a/gcc/ada/makeutl.adb
+++ b/gcc/ada/makeutl.adb
@@ -624,13 +624,11 @@ package body Makeutl is
end if;
elsif Sw'Length >= 4
- and then (Sw (2 .. 3) = "aL"
- or else
- Sw (2 .. 3) = "aO"
- or else
- Sw (2 .. 3) = "aI"
- or else
- (For_Gnatbind and then Sw (2 .. 3) = "A="))
+ and then
+ (Sw (2 .. 3) = "aL" or else
+ Sw (2 .. 3) = "aO" or else
+ Sw (2 .. 3) = "aI"
+ or else (For_Gnatbind and then Sw (2 .. 3) = "A="))
then
Start := 4;
@@ -2562,7 +2560,7 @@ package body Makeutl is
if Source.Id.Path.Name = Q.Table (J).Info.Id.Path.Name
and then Source.Id.Index = Q.Table (J).Info.Id.Index
and then Source.Id.Project.Path.Name =
- Q.Table (J).Info.Id.Project.Path.Name
+ Q.Table (J).Info.Id.Project.Path.Name
then
-- No need to insert this source in the queue, but still
-- return True as we may need to insert its roots.
@@ -3193,9 +3191,8 @@ package body Makeutl is
else
Data.Closure_Needed :=
Has_Mains
- or else
- (Root_Project.Library
- and then Root_Project.Standalone_Library /= No);
+ or else (Root_Project.Library
+ and then Root_Project.Standalone_Library /= No);
Data.Need_Compilation := All_Phases or Option_Compile_Only;
Data.Need_Binding := All_Phases or Option_Bind_Only;
Data.Need_Linking := (All_Phases or Option_Link_Only)