From 9ba9f4c015030ddc1d94c5529c503ab45cdfbd38 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Fri, 13 Nov 2015 14:18:02 +0100 Subject: [PATCH] [multiple changes] 2015-11-13 Hristian Kirtchev * exp_attr.adb: Minor reformatting. 2015-11-13 Pascal Obry * adaint.c: Ensure that it is possible to get killed process status on Windows. From-SVN: r230318 --- gcc/ada/ChangeLog | 23 +++++++++++++++++++++++ gcc/ada/adaint.c | 3 +-- gcc/ada/exp_attr.adb | 44 ++++++++++++++++++++++---------------------- 3 files changed, 46 insertions(+), 24 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index eb9d2fde025..7155aa4a948 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,26 @@ +2015-11-13 Hristian Kirtchev + + * exp_attr.adb: Minor reformatting. + +2015-11-13 Pascal Obry + + * adaint.c: Ensure that it is possible to get killed process + status on Windows. + +2015-11-13 Arnaud Charlet + + * gnat_rm.texi, gnat_ugn.texi, doc/gnat_ugn/gnat_project_manager.rst + doc/gnat_ugn/building_executable_programs_with_gnat.rst, + doc/gnat_ugn/platform_specific_information.rst, + doc/gnat_ugn/gnat_and_program_execution.rst, + doc/gnat_ugn/gnat_utility_programs.rst, + doc/gnat_ugn/the_gnat_compilation_model.rst, + doc/gnat_rm/compatibility_and_porting_guide.rst, + doc/gnat_rm/implementation_defined_pragmas.rst, + doc/gnat_rm/representation_clauses_and_pragmas.rst, + doc/gnat_rm/standard_and_implementation_defined_restrictions.rst: + Update documentation. + 2015-11-13 Eric Botcazou * sigtramp-ios.c, init.c: Minor cosmetic tweaks. diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c index 5fef49cc4c0..1c6d323f0e7 100644 --- a/gcc/ada/adaint.c +++ b/gcc/ada/adaint.c @@ -3200,8 +3200,7 @@ __gnat_kill (int pid, int sig, int close ATTRIBUTE_UNUSED) return; if (sig == 9) { - TerminateProcess (h, 0); - __gnat_win32_remove_handle (NULL, pid); + TerminateProcess (h, 1); } else if (sig == SIGINT) GenerateConsoleCtrlEvent (CTRL_C_EVENT, pid); diff --git a/gcc/ada/exp_attr.adb b/gcc/ada/exp_attr.adb index 50176e7de64..abf7f1bfbcd 100644 --- a/gcc/ada/exp_attr.adb +++ b/gcc/ada/exp_attr.adb @@ -4523,28 +4523,28 @@ package body Exp_Attr is Right_Opnd => Y_Addr); Rewrite (N, - Make_If_Expression (Loc, - New_List ( - Cond, - - Make_Op_Ge (Loc, - Left_Opnd => - Make_Op_Add (Loc, - Left_Opnd => New_Copy_Tree (X_Addr), - Right_Opnd => - Make_Op_Subtract (Loc, - Left_Opnd => X_Size, - Right_Opnd => Make_Integer_Literal (Loc, 1))), - Right_Opnd => Y_Addr), - - Make_Op_Ge (Loc, - Make_Op_Add (Loc, - Left_Opnd => New_Copy_Tree (Y_Addr), - Right_Opnd => - Make_Op_Subtract (Loc, - Left_Opnd => Y_Size, - Right_Opnd => Make_Integer_Literal (Loc, 1))), - Right_Opnd => X_Addr)))); + Make_If_Expression (Loc, New_List ( + Cond, + + Make_Op_Ge (Loc, + Left_Opnd => + Make_Op_Add (Loc, + Left_Opnd => New_Copy_Tree (X_Addr), + Right_Opnd => + Make_Op_Subtract (Loc, + Left_Opnd => X_Size, + Right_Opnd => Make_Integer_Literal (Loc, 1))), + Right_Opnd => Y_Addr), + + Make_Op_Ge (Loc, + Left_Opnd => + Make_Op_Add (Loc, + Left_Opnd => New_Copy_Tree (Y_Addr), + Right_Opnd => + Make_Op_Subtract (Loc, + Left_Opnd => Y_Size, + Right_Opnd => Make_Integer_Literal (Loc, 1))), + Right_Opnd => X_Addr)))); Analyze_And_Resolve (N, Standard_Boolean); end Overlaps_Storage; -- 2.30.2