make.adb: Minor...

2016-05-02  Arnaud Charlet  <charlet@adacore.com>

	* make.adb: Minor: avoid an exception when calling gnatmake with
	no argument and gnatmake is built with checks on.
	* lib-xref-spark_specific.adb: Minor code cleanup.

From-SVN: r235725

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 72a1ae50a764bd7efe6fe4f773ccec0dd3a2ae23..90628591ebf4aa1afe2e885cfdf2d8b300975924 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2016-05-02  Arnaud Charlet  <charlet@adacore.com>
+
+       * make.adb: Minor: avoid an exception when calling gnatmake with
+       no argument and gnatmake is built with checks on.
+       * lib-xref-spark_specific.adb: Minor code cleanup.
+
 2016-05-02  Ed Schonberg  <schonberg@adacore.com>
 
        * sem_util.adb (Normalize_Actuals): Take into account extra

diff --git a/gcc/ada/lib-xref-spark_specific.adb b/gcc/ada/lib-xref-spark_specific.adb
index dcd5e5620a17a06ddcce41088e5213317a908d51..e575150d2b50e591bfc55ad51429d272de39f06d 100644 (file)
--- a/gcc/ada/lib-xref-spark_specific.adb
+++ b/gcc/ada/lib-xref-spark_specific.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 2011-2015, Free Software Foundation, Inc.         --
+--          Copyright (C) 2011-2016, 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- --
@@ -178,7 +178,7 @@ package body SPARK_Specific is
       --  Update scope numbers
 
       declare
-         Scope_Id : Int;
+         Scope_Id : Pos;
       begin
          Scope_Id := 1;
          for Index in From .. SPARK_Scope_Table.Last loop
@@ -917,8 +917,8 @@ package body SPARK_Specific is
      (Sdep_Table : Unit_Ref_Table;
       Num_Sdep   : Nat)
    is
-      D1 : Nat;
-      D2 : Nat;
+      D1 : Pos;
+      D2 : Pos;
 
    begin
       --  Cross-references should have been computed first
@@ -991,9 +991,9 @@ package body SPARK_Specific is
                Srec : SPARK_Scope_Record renames SPARK_Scope_Table.Table (S);
 
                Spec_Entity : constant Entity_Id :=
-                               Unique_Entity (Srec.Scope_Entity);
+                 Unique_Entity (Srec.Scope_Entity);
                Spec_Scope  : constant Scope_Index :=
-                               Entity_Hash_Table.Get (Spec_Entity);
+                 Entity_Hash_Table.Get (Spec_Entity);
 
             begin
                --  Generic spec may be missing in which case Spec_Scope is zero

diff --git a/gcc/ada/make.adb b/gcc/ada/make.adb
index 261f2a64a0681df2730d29f418dd3f0a18e38243..4449ef13f984aa568d1eab567446059d153aadfc 100644 (file)
--- a/gcc/ada/make.adb
+++ b/gcc/ada/make.adb
@@ -6418,7 +6418,7 @@ package body Make is
       --  platform.
 
       declare
-         Arg_Len       : Positive      := Argument_Count;
+         Arg_Len       : Natural       := Argument_Count;
          Call_Gprbuild : Boolean       := False;
          Gprbuild      : String_Access := null;
          Pos           : Natural       := 0;