switch-c.adb, [...]: Minor reformatting.

2012-06-12  Robert Dewar  <dewar@adacore.com>

	* switch-c.adb, inline.adb, usage.adb, opt.ads: Minor reformatting.

From-SVN: r188452

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index b8b8cd92078d828a78aa27f3ac58435d026f8591..4205bb8ea83d05dd89172b9acd9b40a4ff7daff8 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-12  Robert Dewar  <dewar@adacore.com>
+
+       * switch-c.adb, inline.adb, usage.adb, opt.ads: Minor reformatting.
+
 2012-06-12  Robert Dewar  <dewar@adacore.com>
 
        * sem_ch12.adb: Minor reformatting.

diff --git a/gcc/ada/inline.adb b/gcc/ada/inline.adb
index 01f8ff1ccffe8baea07ac4def1cecae8450c00c1..c3947ed2efd0e3551a028e23be5df0b53952dbac 100644 (file)
--- a/gcc/ada/inline.adb
+++ b/gcc/ada/inline.adb
@@ -295,6 +295,7 @@ package body Inline is
               and then Is_Inlined (Scop)
             then
                Add_Call (E, Scop);
+
                if Inline_Level = 1 then
                   return Inline_Call;
                else

diff --git a/gcc/ada/opt.ads b/gcc/ada/opt.ads
index a44d338fd31c84cce08e6ceca69888df49125b41..97e7ba7897a5e7441f2763611121d7bd4b85be74 100644 (file)
--- a/gcc/ada/opt.ads
+++ b/gcc/ada/opt.ads
@@ -735,9 +735,10 @@ package Opt is
 
    Inline_Level : Nat := 0;
    --  GNAT
-   --  Set to indicate the inlining level: 0 means that an appropriate value
-   --  is to be computed by the compiler, 1 is for moderate inlining across
-   --  modules and 2 for full inlining across modules.
+   --  Set to indicate the inlining level: 0 means that an appropriate value is
+   --  to be computed by the compiler based on the optimization level (-gnatn),
+   --  1 is for moderate inlining across modules (-gnatn1) and 2 for full
+   --  inlining across modules (-gnatn2).
 
    Interface_Library_Unit : Boolean := False;
    --  GNATBIND

diff --git a/gcc/ada/switch-c.adb b/gcc/ada/switch-c.adb
index cc724737fc5c126bfd0f4cfff1b621fa5d493987..32c327506a4078104c164a970bdb853a084c325e 100644 (file)
--- a/gcc/ada/switch-c.adb
+++ b/gcc/ada/switch-c.adb
@@ -732,7 +732,7 @@ package body Switch.C is
                Ptr := Ptr + 1;
                Inline_Active := True;
 
-               --  There may be a digit appended to the switch
+               --  There may be a digit (1 or 2) appended to the switch
 
                if Ptr <= Max then
                   C := Switch_Chars (Ptr);

diff --git a/gcc/ada/usage.adb b/gcc/ada/usage.adb
index 292d681a735212f7f4a79dcaa61450da85f7b08a..f95e318e3af032ab1f59a79fcfffa1d93fde940f 100644 (file)
--- a/gcc/ada/usage.adb
+++ b/gcc/ada/usage.adb
@@ -298,7 +298,7 @@ begin
 
    --  Line for -gnatn switch
 
-   Write_Switch_Char ("n[d]");
+   Write_Switch_Char ("n[1|2]");
    Write_Line ("Enable pragma Inline (both within and across units)");
 
    --  Line for -gnatN switch