2011-08-29 Tristan Gingold <gingold@adacore.com>

	* a-exexpr.adb, a-except-2005.ads (Jmpbuf_Address): Move to a-exexpr.adb
	(To_Jmpbuf_Address): Ditto
	(builtin_longjmp): Ditto

2011-08-29  Thomas Quinot  <quinot@adacore.com>

	* sem_res.adb: Minor reformatting.

2011-08-29  Vincent Celier  <celier@adacore.com>

	* make.adb (Gnatmake): Move special processing for VM targets after the
	call to Get_Target_Parameters.

2011-08-29  Thomas Quinot  <quinot@adacore.com>

	* sem_ch12.adb, par-ch12.adb: Minor reformatting.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@178197 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 23 insertions, 23 deletions

diff --git a/gcc/ada/make.adb b/gcc/ada/make.adb
index cc38ae8c4de..d64975d21a3 100644
--- a/gcc/ada/make.adb
+++ b/gcc/ada/make.adb
@@ -5931,29 +5931,6 @@ package body Make is
            ("nothing to do for a main project that is externally built");
       end if;
 
-      --  Special processing for VM targets
-
-      if Targparm.VM_Target /= No_VM then
-
-         --  Set proper processing commands
-
-         case Targparm.VM_Target is
-            when Targparm.JVM_Target =>
-
-               --  Do not check for an object file (".o") when compiling to
-               --  JVM machine since ".class" files are generated instead.
-
-               Check_Object_Consistency := False;
-               Gcc := new String'("jvm-gnatcompile");
-
-            when Targparm.CLI_Target =>
-               Gcc := new String'("dotnet-gnatcompile");
-
-            when Targparm.No_VM =>
-               raise Program_Error;
-         end case;
-      end if;
-
       --  If no project file is used, we just put the gcc switches
       --  from the command line in the Gcc_Switches table.
 
@@ -6125,6 +6102,29 @@ package body Make is
                   Make_Failed ("*** make failed.");
             end;
 
+            --  Special processing for VM targets
+
+            if Targparm.VM_Target /= No_VM then
+
+               --  Set proper processing commands
+
+               case Targparm.VM_Target is
+               when Targparm.JVM_Target =>
+
+                  --  Do not check for an object file (".o") when compiling to
+                  --  JVM machine since ".class" files are generated instead.
+
+                  Check_Object_Consistency := False;
+                  Gcc := new String'("jvm-gnatcompile");
+
+               when Targparm.CLI_Target =>
+                  Gcc := new String'("dotnet-gnatcompile");
+
+               when Targparm.No_VM =>
+                  raise Program_Error;
+               end case;
+            end if;
+
             Is_First_Main := False;
          end if;