[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

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index e50d195412429a4433e4aeb8c6636199f8ec16d3..e826f4e44a125f5dfac5a1942e0a0f75ad4e9c5c 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,12 @@
+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

diff --git a/gcc/ada/gnat1drv.adb b/gcc/ada/gnat1drv.adb
index a7acd29801a6c748d4256425c2c69d50ef3f6d73..b572bc4a987c2bd6d49b5d48d9cd65644c08d8d9 100644 (file)
--- a/gcc/ada/gnat1drv.adb
+++ b/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);

diff --git a/gcc/ada/s-osprim-mingw.adb b/gcc/ada/s-osprim-mingw.adb
index f8a41dd509ced5584a3e0d4f04c5766f6877195e..ddd25544c9761d6528e76fa9a36a0ce436bd70d1 100644 (file)
--- a/gcc/ada/s-osprim-mingw.adb
+++ b/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;