From ddf67a1d5d44d028c1c90ef16c8f5e1d3c6d102c Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Mon, 29 Aug 2011 15:48:36 +0200 Subject: [multiple changes] 2011-08-29 Vincent Celier * make.adb (Scan_Make_Arg): Take any option as is in packages Compiler, Binder or Linker of the main project file. 2011-08-29 Ed Schonberg * inline.adb (Add_Scopes_To_Clean): Exclude any entity within a generic unit. 2011-08-29 Yannick Moy * exp_ch9.adb: Partial revert of previous change for Alfa mode 2011-08-29 Yannick Moy * exp_ch11.adb: Minor expansion of comment. 2011-08-29 Yannick Moy * lib-xref-alfa.adb (Add_ALFA_Scope): Treat generic entities. 2011-08-29 Ed Schonberg * sem_res.adb (Resolve_Arithmetic_Op): If the node has a universal interpretation, set the type before resolving the operands, because legality checks on an exponention operand need to know the type of the context. 2011-08-29 Ed Schonberg * sem_ch12.adb (Analyze_Package_Instantiation): Do not set delayed cleanups on a master if the instance is within a generic unit. Complement to the corresponding fix to inline.adb for K520-030. 2011-08-29 Tristan Gingold * exp_ch7.adb (Build_Raise_Statement): Raise PE instead of the current occurrence. * exp_intr.adb: Minor comment fix. 2011-08-29 Bob Duff * sem_ch13.adb (Analyze_Aspect_Specifications): Fix cases where Delay_Required was used as an uninitialized variable. From-SVN: r178233 --- gcc/ada/make.adb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gcc/ada/make.adb') diff --git a/gcc/ada/make.adb b/gcc/ada/make.adb index ce12020..c7e1d07 100644 --- a/gcc/ada/make.adb +++ b/gcc/ada/make.adb @@ -7373,15 +7373,15 @@ package body Make is end if; - -- Then check if we are dealing with -cargs/-bargs/-largs/-margs - - elsif Argv = "-bargs" - or else - Argv = "-cargs" - or else - Argv = "-largs" - or else - Argv = "-margs" + -- Then check if we are dealing with -cargs/-bargs/-largs/-margs. These + -- options are taken as is when found in package Compiler, Binder or + -- Linker of the main project file. + + elsif (And_Save or else Program_Args = None) + and then (Argv = "-bargs" or else + Argv = "-cargs" or else + Argv = "-largs" or else + Argv = "-margs") then case Argv (2) is when 'c' => Program_Args := Compiler; -- cgit v1.1