diff options
| -rw-r--r-- | gcc/ada/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/ada/inline.adb | 1 | ||||
| -rw-r--r-- | gcc/ada/opt.ads | 7 | ||||
| -rw-r--r-- | gcc/ada/switch-c.adb | 2 | ||||
| -rw-r--r-- | gcc/ada/usage.adb | 2 |
5 files changed, 11 insertions, 5 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index b8b8cd92078..4205bb8ea83 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,5 +1,9 @@ 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. 2012-06-12 Eric Botcazou <ebotcazou@adacore.com> diff --git a/gcc/ada/inline.adb b/gcc/ada/inline.adb index 01f8ff1ccff..c3947ed2efd 100644 --- 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 a44d338fd31..97e7ba7897a 100644 --- 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 cc724737fc5..32c327506a4 100644 --- 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 292d681a735..f95e318e3af 100644 --- 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 |