From: Arnaud Charlet Date: Fri, 20 Feb 2015 09:55:51 +0000 (+0100) Subject: [multiple changes] X-Git-Tag: upstream/12.2.0~56563 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6b66981a2f73615e0d3bb422a44b70a2ff38740d;p=platform%2Fupstream%2Fgcc.git [multiple changes] 2015-02-20 Eric Botcazou * gnat1drv.adb: Minor consistency fix. 2015-02-20 Pascal Obry * 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 e50d195..e826f4e 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,5 +1,14 @@ 2015-02-20 Eric Botcazou + * gnat1drv.adb: Minor consistency fix. + +2015-02-20 Pascal Obry + + * s-osprim-mingw.adb (Get_Base_Time): Properly release lock in all + paths. + +2015-02-20 Eric Botcazou + * inline.adb (Expand_Inlined_Call): Skip again calls to subprogram renamings. * exp_ch6.adb (Expand_Call): Use back-end inlining diff --git a/gcc/ada/gnat1drv.adb b/gcc/ada/gnat1drv.adb index a7acd29..b572bc4 100644 --- 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 f8a41dd..ddd2554 100644 --- 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;