[multiple changes]

2015-02-20  Eric Botcazou  <ebotcazou@adacore.com>

	* gnat1drv.adb: Minor consistency fix.

2015-02-20  Pascal Obry  <obry@adacore.com>

	* s-osprim-mingw.adb (Get_Base_Time): Properly release lock in all
	paths.

From-SVN: r220845

gcc/ada/ChangeLog

 2015-02-20  Eric Botcazou  <ebotcazou@adacore.com>
 
+	* gnat1drv.adb: Minor consistency fix.
+
+2015-02-20  Pascal Obry  <obry@adacore.com>
+
+	* s-osprim-mingw.adb (Get_Base_Time): Properly release lock in all
+	paths.
+
+2015-02-20  Eric Botcazou  <ebotcazou@adacore.com>
+
 	* inline.adb (Expand_Inlined_Call): Skip again calls to subprogram
 	renamings.
 	* exp_ch6.adb (Expand_Call): Use back-end inlining

gcc/ada/gnat1drv.adb

@@ -1238,8 +1238,8 @@ begin
         and then
           (not (Back_Annotate_Rep_Info or Generate_SCIL or GNATprove_Mode)
             or else Main_Kind = N_Subunit
-            or else Targparm.Frontend_Layout_On_Target
-            or else Targparm.VM_Target /= No_VM)
+            or else Frontend_Layout_On_Target
+            or else VM_Target /= No_VM)
       then
          Post_Compilation_Validation_Checks;
          Errout.Finalize (Last_Call => True);

gcc/ada/s-osprim-mingw.adb

@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1998-2014, Free Software Foundation, Inc.         --
+--          Copyright (C) 1998-2015, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNARL 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- --
@@ -216,6 +216,7 @@ package body System.OS_Primitives is
       --  base data (time, clock, ticks) have already been updated.
 
       if Sig /= Signature then
+         Unlock;
          return;
       end if;