[multiple changes]

2014-08-01  Robert Dewar  <dewar@adacore.com>

	* make.adb, makeutl.ads: Minor reformatting.
	* debug.adb, opt.ads: Clarify documentation of Front_End_Inlining and
	Back_End_Inlining.

2014-08-01  Tristan Gingold  <gingold@adacore.com>

	* gnatcmd.adb (GNATCmd): Set AAMP_On_Target using command name.

From-SVN: r213453

gcc/ada/ChangeLog

+2014-08-01  Robert Dewar  <dewar@adacore.com>
+
+	* make.adb, makeutl.ads: Minor reformatting.
+	* debug.adb, opt.ads: Clarify documentation of Front_End_Inlining and
+	Back_End_Inlining.
+
+2014-08-01  Tristan Gingold  <gingold@adacore.com>
+
+	* gnatcmd.adb (GNATCmd): Set AAMP_On_Target using command name.
+
 2014-08-01  Javier Miranda  <miranda@adacore.com>
 
 	* gnat1drv.adb (Adjust_Global_Switches): Reverse meaning of

gcc/ada/debug.adb

@@ -116,7 +116,7 @@ package body Debug is
    --  d.w  Do not check for infinite loops
    --  d.x  No exception handlers
    --  d.y
-   --  d.z  Disable support for back end inlining
+   --  d.z  Restore previous support for frontend handling of Inline_Always
 
    --  d.A  Read/write Aspect_Specifications hash table to tree
    --  d.B
@@ -582,14 +582,12 @@ package body Debug is
    --       fully compiled and analyzed, they just get eliminated from the
    --       code generation step.
 
-   --  d.z  Disable back end inlining. Back end inlining is enabled by default
-   --       on targets that have the GCC backend (ie. all targets except AAMP,
-   --       .NET and JVM). Back end inlining has no effect under GNATprove to
-   --       avoid confusing the formal verification output, and it is disabled
-   --       if the sources are compiled with frontend inlining (ie. -gnatN) to
-   --       minimize the output differences to customers still using this
-   --       deprecated switch. The flag .z facilitates disabling the back end
-   --       inlining in case of unexpected problems.
+   --  d.z  Restore previous front-end support for Inline_Always. In default
+   --       mode, for targets that use the GCC back end (i.e. currently all
+   --       targets except AAMP, .NET, JVM, and GNATprove), Inline_Always is
+   --       handled by the back end. Use of this switch restores the previous
+   --       handling of Inline_Always by the front end on such targets. For the
+   --       targets that do not use the GCC back end, this switch is ignored.
 
    --  d.A  There seems to be a problem with ASIS if we activate the circuit
    --       for reading and writing the aspect specification hash table, so

gcc/ada/gnatcmd.adb

@@ -1584,15 +1584,12 @@ begin
    Rules_Switches.Init;
    Rules_Switches.Set_Last (0);
 
-   --  Add the default search directories, to be able to find system.ads in the
-   --  subsequent call to Targparm.Get_Target_Parameters.
+   --  Set AAMP_On_Target from the command name, for testing in
+   --  Osint.Program_Name to handle the mapping of GNAAMP tool names. We don't
+   --  extract it from system.ads, has there may be no default runtime.
 
-   Add_Default_Search_Dirs;
-
-   --  Get target parameters so that AAMP_On_Target will be set, for testing in
-   --  Osint.Program_Name to handle the mapping of GNAAMP tool names.
-
-   Targparm.Get_Target_Parameters;
+   Find_Program_Name;
+   AAMP_On_Target := Name_Buffer (1 .. Name_Len) = "gnaampcmd";
 
    --  Put the command line in environment variable GNAT_DRIVER_COMMAND_LINE,
    --  so that the spawned tool may know the way the GNAT driver was invoked.

gcc/ada/makeutl.ads

@@ -87,7 +87,7 @@ package Makeutl is
 
    Keep_Temp_Files_Option : constant String := "--keep-temp-files";
    --  Switch to suppress deletion of temp files created by the builder.
-   --  Equivallent of -dn.
+   --  Note that debug switch -gnatdn also has this effect.
 
    Load_Standard_Base : Boolean := True;
    --  False when gprbuild is called with --db-

gcc/ada/opt.ads

@@ -248,7 +248,10 @@ package Opt is
 
    Back_End_Inlining : Boolean := False;
    --  GNAT
-   --  Set True to activate inlining by back-end expansion
+   --  Set True to activate inlining by back-end expansion. This is the normal
+   --  default mode for gcc targets, so it is True on such targets unless the
+   --  switches -gnatN or -gnatd.z are used. See circuitry in gnat1drv for the
+   --  exact conditions for setting this switch.
 
    Bind_Alternate_Main_Name : Boolean := False;
    --  GNATBIND
@@ -823,7 +826,10 @@ package Opt is
 
    Front_End_Inlining : Boolean := False;
    --  GNAT
-   --  Set True to activate inlining by front-end expansion
+   --  Set True to activate inlining by front-end expansion (even on GCC
+   --  targets, where inlining is normally handled by the back end). Set by
+   --  the flag -gnatN (which is now considered obsolescent, since the GCC
+   --  back end can do a better job of inlining than the front end these days.
 
    Inline_Processing_Required : Boolean := False;
    --  GNAT