[multiple changes]

2004-04-19  Arnaud Charlet  <charlet@act-europe.fr>

	* 5isystem.ads: Removed, unused.

	* gnat_rm.texi: Redo 1.13 change.

2004-04-19  Robert Dewar  <dewar@gnat.com>

	* s-stoele.ads: Clean up definition of Storage_Offset (the new
	definition is cleaner, avoids the kludge of explicit Standard operator
	references, and also is consistent with a visible System.Address with
	no visible operations.

	* s-geveop.adb: Add declarations to avoid assumption of visible
	operations on type System.Address (since these might not be available
	if Address is a non-private type for which the operations
	are made abstract).

	* sem_eval.adb: Minor reformatting

	* s-carsi8.ads, s-carun8.ads, s-casi16.ads, s-casi32.ads,
	s-casi64.ads, s-caun16.ads, s-caun32.ads, s-caun64.ads: Minor
	reformatting (new function spec format).

	* s-auxdec.adb, s-carsi8.adb, s-carun8.adb, s-casi16.adb,
	s-casi32.adb, s-casi64.adb, s-caun16.adb, s-caun32.adb,
	s-caun64.adb: Add declarations to avoid assumption of visible
	operations on type System.Address (since these might not be available
	if Address is a non-private type for which the operations are made
	abstract).

	* lib.ads, lib.adb (Synchronize_Serial_Number): New procedure.

	* exp_intr.adb: Minor comment update

	* exp_aggr.adb, exp_attr.adb, exp_ch13.adb: Minor reformatting.

	* 5omastop.adb: Add declarations to avoid assumption of visible
	operations on type System.Address (since these might not be available
	if Address is a non-private type for which the operations
	are made abstract).

2004-04-19  Vincent Celier  <celier@gnat.com>

	* switch-m.adb: (Scan_Make_Switches): Process new switch -eL

	* prj-pars.ads (Parse): New Boolean parameter Process_Languages,
	defaulted to Ada.

	* prj-proc.adb (Process): New Boolean parameter Process_Languages,
	defaulted to Ada.
	Call Check with Process_Languages.
	(Check): New Boolean parameter Process_Languages. Call Recursive_Check
	with Process_Languages.
	(Recursive_Check): New Boolean parameter Process_Languages. Call
	Nmsc.Ada_Check or Nmsc.Other_Languages_Check according to
	Process_Languages.

	* prj-proc.ads (Process): New Boolean parameter Process_Languages,

	* prj-util.ads, prj-util.adb (Executable_Of): New Boolean
	parameter Ada_Main, defaulted to True.
	Check for Ada specific characteristics only when Ada_Main is True.

	* opt.ads: (Follow_Links): New Boolean flag for gnatmake

	* prj.adb: (Project_Empty): Add new Project_Data components.

	* prj.ads: New types and tables for non Ada languages.
	(Project_Data): New components Languages, Impl_Suffixes,
	First_Other_Source, Last_Other_Source, Imported_Directories_Switches,
	Include_Path, Include_Data_Set.

	* prj-env.ads, prj-env.adb: Minor reformatting

	* prj-nmsc.ads, prj-nmsc.adb: (Other_Languages_Check): New procedure
	Put subprograms in alphabetical order

	* prj-pars.adb (Parse): New Boolean parameter Process_Languages,
	defaulted to Ada; Call Prj.Proc.Process with Process_Languages and
	Opt.Follow_Links.

	* mlib-prj.adb: Back out modification in last version, as they are
	incorrect.
	(Build_Library.Check_Libs): Remove useless pragma Warnings (Off)

	* make.adb: (Mains): Moved to package Makeutl
	(Linker_Opts): Moved to package Makeutl
	(Is_External_Assignment): Moved to package Makeutl
	(Test_If_Relative_Path): Moved to package Makeutl
	(Gnatmake): Move sorting of linker options to function
	Makeutl.Linker_Options_Switches.

	* Makefile.in: Add makeutl.o to the object files for gnatmake

	* makeusg.adb: Add line for new switch -eL.

	* gnatls.adb (Image): New function.
	(Output_Unit): If in verbose mode, output the list of restrictions
	specified by pragmas Restrictions.

	* 5bml-tgt.adb, 5vml-tgt.adb (Build_Dynamic_Library): Do not use
	Text_IO.

	* a-calend.adb (Split): Shift the date by multiple of 56 years, if
	needed, to put it in the range 1970 (included) - 2026 (excluded).
	(Time_Of): Do not shift Unix_Min_Year (1970).
	Shift the date by multiple of 56 years, if needed, to put it in the
	range 1970 (included) - 2026 (excluded).

	* adaint.h, adaint.c (__gnat_set_executable): New function.

2004-04-19  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>

	* trans.c (tree_transform, case N_Subprogram_Body): Temporarily push
	and pop GC context.
	(tree_transform, case N_Procedure_Call): Fix typo in setting TREE_TYPE.
	(tree_transform, case N_Label): Don't set LABEL_STMT_FIRST_IN_EH.
	(tree_transform, case N_Procedure_Call_Statement): Build a tree.
	(tree_transform, case N_Code_Statement): Likewise.
	(gnat_expand_stmt, case LABEL_STMT): Don't look at
	LABEL_STMT_FIRST_IN_EH.
	(gnat_expand_stmt, case ASM_STMT): New case.

	* utils2.c (build_unary_op): Properly set TREE_READONLY of
	UNCONSTRAINED_ARRAY_REF.

	* utils.c (poplevel): Temporarily push/pop GC context around inline
	function expansion.

	* decl.c (maybe_variable): Properly set TREE_READONLY of
	UNCONSTRAINED_ARRAY_REF.
	(make_packable_type): Only reference TYPE_IS_PADDING_P for RECORD_TYPE.

	* ada-tree.def: (ASM_STMT): New.

	* ada-tree.h: (LABEL_STMT_FIRST_IN_EH): Deleted.
	(ASM_STMT_TEMPLATE, ASM_STMT_OUTPUT, ASM_STMT_ORIG_OUT,
	ASM_STMT_INPUT): New.
	(ASM_STMT_CLOBBER): Likewise.

2004-04-19  Thomas Quinot  <quinot@act-europe.fr>

	* a-except.adb, s-parint.ads, s-parint.adb, types.ads, types.h: Use
	general rcheck mechanism to raise Program_Error for E.4(18), instead
	of a custom raiser in System.Partition_Interface.
	Part of general cleanup work before PolyORB integration.

	* snames.ads, snames.adb: Add new runtime library entities and names
	for PolyORB DSA.

	* sem_dist.ads, sem_dist.adb (Get_Subprogram_Id): Move from sem_dist to
	exp_dist.
	(Build_Subprogram_Id): New subprogram provided by exp_dist
	Code reorganisation in preparation for PolyORB integration.

	* exp_dist.ads, exp_dist.adb (Get_Subprogram_Id): Move from sem_dist to
	exp_dist.
	(Build_Subprogram_Id): New subprogram provided by exp_dist

	* sem_ch4.adb (Analyze_One_Call): Fix error message for mismatch in
	actual parameter types for call to dereference of an
	access-to-subprogram type.

	* rtsfind.ads: Add new runtime library entities and names for PolyORB
	DSA.

	* gnatlink.adb (Value): Remove. Use Interfaces.C.Strings.Value
	instead, which has the same behaviour here since we never pass it a
	NULL pointer.

	* link.c (run_path_option, Solaris case): Use -Wl, as for other
	platforms.

	* Makefile.in: adjust object file lists for gnatlink and gnatmake
	to account for new dependency upon Interfaces.C.Strings + link.o
	For x86 FreeBSD, use 86numaux.

	* make.adb, gnatcmd.adb: Linker_Library_Path_Option has been moved up
	from Mlib.Tgt to Mlib.

	* mlib.ads, mlib.adb (Linker_Library_Path_Option): New subprogram, now
	target-independent.

	* mlib-tgt.ads, mlib-tgt.adb (Linker_Library_Path_Option): Remove
	target-specific versions of this subprogram, now implemented as a
	target-independent function in Mlib.

	* 5aml-tgt.adb, 5bml-tgt.adb, 5gml-tgt.adb, 5hml-tgt.adb, 5lml-tgt.adb,
	5sml-tgt.adb, 5vml-tgt.adb, 5zml-tgt.adb, 5wml-tgt.adb
	(Linker_Library_Path_Option): Remove target-specific versions of this
	subprogram, now implemented as a target-independent function in Mlib.

	* atree.adb: (Allocate_Initialize_Node): New subprogram.
	Factors out node table slots allocation.
	(Fix_Parents): New subprogram.
	Encapsulate the pattern of fixing up parent pointers for syntactic
	children of a rewritten node.
	(New_Copy_Tree): Use New_Copy to copy non-entity nodes.
	(Rewrite): Use New_Copy when creating saved copy of original node.
	(Replace): Use Copy_Node to copy nodes.

2004-04-19  Javier Miranda  <miranda@gnat.com>

	* sprint.adb (Sprint_Node_Actual): Give support to the new
	Access_To_Subprogram node available in Access_Definition nodes. In
	addition, give support to the AI-231 node fields: null-exclusion,
	all-present, constant-present.

	* sem_util.ads, sem_util.adb: (Has_Declarations): New subprogram

	* sinfo.ads, sinfo.adb:
	New field Access_To_Subprogram_Definition in Access_Definition nodes

	* sem_ch6.adb (Process_Formals): Move here the code that creates and
	decorates internal subtype declaration corresponding to the
	null-excluding formal. This code was previously in Set_Actual_Subtypes.
	In addition, carry out some code cleanup on this code. In case of
	access to protected subprogram call
	Replace_Anonymous_Access_To_Protected_Subprogram.
	(Set_Actual_Subtypes): Code cleanup.

	* sem_ch8.adb (Analyze_Object_Renaming): Remove un-necessary call to
	Find_Type in case of anonymous access renamings. Add warning in case of
	null-excluding attribute used in anonymous access renaming.

	* sem_ch3.ads (Replace_Anonymous_Access_To_Protected_Subprogram): New
	subprogram

	* sem_ch3.adb (Replace_Anonymous_Access_To_Protected_Subprogram): New
	subprogram.
	(Access_Definition): In case of anonymous access to subprograms call
	the corresponding semantic routine to decorate the node.
	(Access_Subprogram_Declaration): Addition of some comments indicating
	some code that probably should be added here. Detected by comparison
	with the access_definition subprogram.
	(Analyze_Component_Declaration): In case of access to protected
	subprogram call Replace_Anonymous_Access_To_Protected.
	(Array_Type_Declaration): In case of access to protected subprogram call
	Replace_Anonymous_Access_To_Protected_Subprogram.
	(Process_Discriminants): In case of access to protected subprogram call
	Replace_Anonymous_Access_To_Protected_Subprogram.

	* par.adb (P_Access_Definition): New formal that indicates if the
	null-exclusion part was present.
	(P_Access_Type_Definition): New formal that indicates if the caller has
	already parsed the null-excluding part.

	* par-ch3.adb (P_Subtype_Declaration): Code cleanup.
	(P_Identifier_Declarations): Code cleanup and give support to renamings
	of anonymous access to subprogram types.
	(P_Derived_Type_Def_Or_Private_Ext_Decl): Code cleanup.
	(P_Array_Type_Definition): Give support to AI-254.
	(P_Component_Items): Give support to AI-254.
	(P_Access_Definition): New formal that indicates if the header was
	already parsed by the caller.
	(P_Access_Type_Definition): New formal that indicates if the caller has
	already parsed the null-excluding part.

	* par-ch6.adb (P_Formal_Part): Add the null-excluding parameter to the
	call to P_Access_Definition.

2004-04-19  Geert Bosch  <bosch@gnat.com>

	* checks.adb (Apply_Float_Conversion_Check): New procedure to implement
	the delicate semantics of floating-point to integer conversion.
	(Apply_Type_Conversion_Checks): Use Apply_Float_Conversion_Check.

	* eval_fat.adb (Machine_Mantissa): Moved to spec.
	(Machine_Radix): New function.

	* eval_fat.ads (Machine_Mantissa): Moved from body for use in
	conversion checks.
	(Machine_Radix): New function also for use in conversion checks.

2004-04-19  Ed Schonberg  <schonberg@gnat.com>

	* par-prag.adb (Source_File_Name_Project): Fix typo in error message.

	* exp_ch9.adb (Expand_Access_Protected_Subprogram_Type): Call analyze
	to decorate the access-to-protected subprogram and the equivalent type.

	* checks.adb (Null_Exclusion_Static_Checks): Code cleanup. Give support
	to anonymous access to subprogram types.

	* exp_ch4.adb (Expand_N_In): Preserve Static flag before
	constant-folding, for legality checks in contexts that require an RM
	static expression.

	* exp_ch6.adb (Expand_N_Function_Call): If call may generate large
	temporary but stack checking is not enabled, increment serial number
	to so that symbol generation is consistent with and without stack
	checking.

	* exp_util.ads, exp_util.adb (May_Generate_Large_Temp): Predicate is
	independent on whether stack checking is enabled, caller must check
	the corresponding flag.

	* sem_ch3.adb (Constrain_Index): Index bounds given by attributes need
	range checks.
	(Build_Derived_Concurrent_Type): Inherit Is_Constrained flag from
	parent if it has discriminants.
	(Build_Derived_Private_Type): Constructed full view does
	not come from source.
	(Process_Discriminants): Default discriminants on a tagged type are
	legal if this is the internal completion of a private untagged
	derivation.

	* sem_ch6.adb (Set_Actual_Subtypes): The generated declaration needs
	no constraint checks, because it corresponds to an existing object.

	* sem_prag.adb (Process_Convention): Pragma applies
	only to subprograms in the same declarative part, i.e. the same unit,
	not the same scope.

	* sem_res.adb (Valid_Conversion): In an instance or inlined body,
	ignore type mismatch on a numeric conversion if expression comes from
	expansion.

2004-04-19  Sergey Rybin  <rybin@act-europe.fr>

	* sem_elim.adb (Process_Eliminate_Pragma): Remove the processing for
	Homonym_Number parameter, add processing for Source_Location parameter
	corresponding.
	(Check_Eliminated): Remove the check for homonym numbers, add the check
	for source location traces.

	* sem_elim.ads (Process_Eliminate_Pragma): Replace Arg_Homonym_Number
	with Arg_Source_Location corresponding to the changes in the format of
	the pragma.

	* sem_prag.adb: (Analyze_Pragma): Changes in the processing of
	Eliminate pragma corresponding to the changes in the format of the
	pragma: Homonym_Number is replaced with Source_Location, two ways of
	distinguishing homonyms are mutially-exclusive.

2004-04-19  Joel Brobecker  <brobecker@gnat.com>

	* get_targ.ads (Get_No_Dollar_In_Label): Remove.

	* exp_dbug.adb (Output_Homonym_Numbers_Suffix): Remove use of
	No_Dollar_In_Label, no longer necessary, as it is always True.
	(Strip_Suffixes): Likewise.

2004-04-19  Gary Dismukes  <dismukes@gnat.com>

	* s-stalib.ads (type Exception_Code): Use Integer'Size for exponent of
	modulus for compatibility with size clause on targets with 16-bit
	Integer.

	* layout.adb (Discrimify): In the case of private types, set Vtyp to
	full type to fix type mismatches on calls to size functions for
	discriminant-dependent array components.

2004-04-19  Jerome Guitton  <guitton@act-europe.fr>

	* Makefile.in (gnatlib-zcx): New target, for building a ZCX run-time
	lib.

2004-04-19  Pascal Obry  <obry@gnat.com>

	* mdll-utl.adb (Locate): New version is idempotent.

From-SVN: r80856

1 files changed, 73 insertions, 60 deletions

diff --git a/gcc/ada/trans.c b/gcc/ada/trans.c
index 8b24761c3a5..9c5b3f5f883 100644
--- a/gcc/ada/trans.c
+++ b/gcc/ada/trans.c
@@ -2073,10 +2073,6 @@ tree_transform (Node_Id gnat_node)
 
     case N_Label:
       gnu_result = build_nt (LABEL_STMT, gnat_to_gnu (Identifier (gnat_node)));
-      LABEL_STMT_FIRST_IN_EH (gnu_result)
-	=  (Present (Parent (gnat_node))
-	    && Nkind (Parent (gnat_node)) == N_Exception_Handler
-	    && First (Statements (Parent (gnat_node))) == gnat_node);
       break;
 
     case N_Null_Statement:
@@ -2649,6 +2645,9 @@ tree_transform (Node_Id gnat_node)
 
 	gnu_subprog_type = TREE_TYPE (gnu_subprog_decl);
 
+	/* ??? Temporarily do this to avoid GC throwing away outer stuff.  */
+	ggc_push_context ();
+
 	/* Set the line number in the decl to correspond to that of
 	   the body so that the line number notes are written
 	   correctly.  */
@@ -2769,15 +2768,12 @@ tree_transform (Node_Id gnat_node)
 	mark_out_of_scope (Defining_Unit_Name (Specification (gnat_node)));
 	write_symbols = save_write_symbols;
 	debug_hooks = save_debug_hooks;
+	ggc_pop_context ();
       }
       break;
 
     case N_Function_Call:
     case N_Procedure_Call_Statement:
-
-      if (type_annotate_only)
-	break;
-
       {
 	/* The GCC node corresponding to the GNAT subprogram name.  This can
 	   either be a FUNCTION_DECL node if we are dealing with a standard
@@ -2792,6 +2788,7 @@ tree_transform (Node_Id gnat_node)
 	Node_Id gnat_actual;
 	tree gnu_actual_list = NULL_TREE;
 	tree gnu_name_list = NULL_TREE;
+	tree gnu_before_list = NULL_TREE;
 	tree gnu_after_list = NULL_TREE;
 	tree gnu_subprog_call;
 
@@ -2827,8 +2824,9 @@ tree_transform (Node_Id gnat_node)
 			    build_call_raise (PE_Stubbed_Subprogram_Called));
 	      }
 	    else
-	      expand_expr_stmt
-	        (build_call_raise (PE_Stubbed_Subprogram_Called));
+	      gnu_result
+		= build_nt (EXPR_STMT,
+			    build_call_raise (PE_Stubbed_Subprogram_Called));
 	    break;
 	  }
 
@@ -2920,10 +2918,15 @@ tree_transform (Node_Id gnat_node)
 		      }
 
 		    /* Set up to move the copy back to the original.  */
-		    gnu_after_list = tree_cons (gnu_copy, gnu_actual,
-						gnu_after_list);
-
-		    gnu_name = gnu_actual;
+		    gnu_temp
+		      = build_nt (EXPR_STMT,
+				  build (MODIFY_EXPR, TREE_TYPE (gnu_copy),
+					 gnu_copy, gnu_actual));
+
+		    TREE_TYPE (gnu_temp) = void_type_node;
+		    TREE_SLOC (gnu_temp) = Sloc (gnat_actual);
+		    TREE_CHAIN (gnu_temp) = gnu_after_list;
+		    gnu_after_list = gnu_temp;
 		  }
 	      }
 
@@ -3115,6 +3118,7 @@ tree_transform (Node_Id gnat_node)
 					   gnu_result);
 
 	    gnu_result_type = get_unpadded_type (Etype (gnat_node));
+	    break;
 	  }
 
 	/* If this is the case where the GNAT tree contains a procedure call
@@ -3218,26 +3222,29 @@ tree_transform (Node_Id gnat_node)
 					      gnu_result);
 		    }
 
-		  set_lineno (gnat_node, 1);
-		  expand_expr_stmt (build_binary_op (MODIFY_EXPR, NULL_TREE,
-						     gnu_actual, gnu_result));
+		  gnu_result
+		    = build_nt (EXPR_STMT,
+				build_binary_op (MODIFY_EXPR, NULL_TREE,
+						 gnu_actual, gnu_result));
+		  TREE_TYPE (gnu_result) = void_type_node;
+		  TREE_SLOC (gnu_result) = Sloc (gnat_actual);
+		  TREE_CHAIN (gnu_result) = gnu_before_list;
+		  gnu_before_list = gnu_result;
 		  scalar_return_list = TREE_CHAIN (scalar_return_list);
 		  gnu_name_list = TREE_CHAIN (gnu_name_list);
 		}
 	  }
 	else
 	  {
-	    set_lineno (gnat_node, 1);
-	    expand_expr_stmt (gnu_subprog_call);
+	    gnu_before_list = build_nt (EXPR_STMT, gnu_subprog_call);
+	    TREE_TYPE (gnu_before_list) = void_type_node;
+	    TREE_SLOC (gnu_before_list) = Sloc (gnat_node);
 	  }
 
-	/* Handle anything we need to assign back.  */
-	for (gnu_expr = gnu_after_list;
-	     gnu_expr;
-	     gnu_expr = TREE_CHAIN (gnu_expr))
-	  expand_expr_stmt (build_binary_op (MODIFY_EXPR, NULL_TREE,
-					     TREE_PURPOSE (gnu_expr),
-					     TREE_VALUE (gnu_expr)));
+	gnu_result = chainon (nreverse (gnu_before_list),
+			      nreverse (gnu_after_list));
+	if (TREE_CHAIN (gnu_result))
+	  gnu_result = build_nt (BLOCK_STMT, gnu_result);
       }
       break;
 
@@ -3895,22 +3902,10 @@ tree_transform (Node_Id gnat_node)
 	  gnu_input_list = nreverse (gnu_input_list);
 	  gnu_output_list = nreverse (gnu_output_list);
 	  gnu_orig_out_list = nreverse (gnu_orig_out_list);
-	  expand_asm_operands (gnu_template, gnu_output_list, gnu_input_list,
-			       gnu_clobber_list, Is_Asm_Volatile (gnat_node),
-			       input_location);
-
-	  /* Copy all the intermediate outputs into the specified outputs.  */
-	  for (; gnu_output_list;
-	       (gnu_output_list = TREE_CHAIN (gnu_output_list),
-		gnu_orig_out_list = TREE_CHAIN (gnu_orig_out_list)))
-	    if (TREE_VALUE (gnu_orig_out_list) != TREE_VALUE (gnu_output_list))
-	      {
-		expand_expr_stmt
-		  (build_binary_op (MODIFY_EXPR, NULL_TREE,
-				    TREE_VALUE (gnu_orig_out_list),
-				    TREE_VALUE (gnu_output_list)));
-		free_temp_slots ();
-	      }
+	  gnu_result = build_nt (ASM_STMT, gnu_template, gnu_output_list,
+				 gnu_orig_out_list, gnu_input_list,
+				 gnu_clobber_list);
+	  TREE_THIS_VOLATILE (gnu_result) = Is_Asm_Volatile (gnat_node);
 	}
       break;
 
@@ -3974,11 +3969,12 @@ tree_transform (Node_Id gnat_node)
 					 gnu_ptr, gnu_byte_offset);
 	    }
 
-	  set_lineno (gnat_node, 1);
-	  expand_expr_stmt
-	    (build_call_alloc_dealloc (gnu_ptr, gnu_obj_size, align,
-				       Procedure_To_Call (gnat_node),
-				       Storage_Pool (gnat_node), gnat_node));
+	  gnu_result
+	    = build_nt (EXPR_STMT,
+			build_call_alloc_dealloc
+			(gnu_ptr, gnu_obj_size, align,
+			 Procedure_To_Call (gnat_node),
+			 Storage_Pool (gnat_node), gnat_node));
 	}
       break;
 
@@ -3997,15 +3993,14 @@ tree_transform (Node_Id gnat_node)
 	 is one.  */
       if (TREE_CODE (gnu_result_type) == VOID_TYPE)
 	{
-	  set_lineno (gnat_node, 1);
+	  gnu_result = build_nt (EXPR_STMT, gnu_result);
+	  TREE_TYPE (gnu_result) = void_type_node;
+	  TREE_SLOC (gnu_result) = Sloc (gnat_node);
 
 	  if (Present (Condition (gnat_node)))
-	    expand_start_cond (gnat_to_gnu (Condition (gnat_node)), 0);
-
-	  expand_expr_stmt (gnu_result);
-	  if (Present (Condition (gnat_node)))
-	    expand_end_cond ();
-	  gnu_result = error_mark_node;
+	    gnu_result = build_nt (IF_STMT,
+				   gnat_to_gnu (Condition (gnat_node)),
+				   gnu_result, NULL_TREE, NULL_TREE);
 	}
       else
 	gnu_result = build1 (NULL_EXPR, gnu_result_type, gnu_result);
@@ -4235,7 +4230,7 @@ make_expr_stmt_from_rtl (rtx insns, Node_Id gnat_node)
 void
 gnat_expand_stmt (tree gnu_stmt)
 {
-  tree gnu_elmt;
+  tree gnu_elmt, gnu_elmt_2;
 
   if (TREE_SLOC (gnu_stmt))
     set_lineno_from_sloc (TREE_SLOC (gnu_stmt), 1);
@@ -4283,11 +4278,6 @@ gnat_expand_stmt (tree gnu_stmt)
 
     case LABEL_STMT:
       expand_label (LABEL_STMT_LABEL (gnu_stmt));
-      if (LABEL_STMT_FIRST_IN_EH (gnu_stmt))
-	nonlocal_goto_handler_labels
-	  = gen_rtx_EXPR_LIST (VOIDmode,
-			       label_rtx (LABEL_STMT_LABEL (gnu_stmt)),
-			       nonlocal_goto_handler_labels);
       break;
 
     case RETURN_STMT:
@@ -4299,6 +4289,29 @@ gnat_expand_stmt (tree gnu_stmt)
 	expand_null_return ();
       break;
 
+    case ASM_STMT:
+      expand_asm_operands (ASM_STMT_TEMPLATE (gnu_stmt),
+			   ASM_STMT_OUTPUT (gnu_stmt),
+			   ASM_STMT_INPUT (gnu_stmt),
+			   ASM_STMT_CLOBBER (gnu_stmt),
+			   TREE_THIS_VOLATILE (gnu_stmt), input_location);
+
+      /* Copy all the intermediate outputs into the specified outputs.  */
+      for ((gnu_elmt = ASM_STMT_OUTPUT (gnu_stmt),
+	    gnu_elmt_2 = ASM_STMT_ORIG_OUT (gnu_stmt));
+	   gnu_elmt;
+	   (gnu_elmt = TREE_CHAIN (gnu_elmt),
+	    gnu_elmt_2 = TREE_CHAIN (gnu_elmt_2)))
+	if (TREE_VALUE (gnu_elmt) != TREE_VALUE (gnu_elmt_2))
+	  {
+	    expand_expr_stmt
+	      (build_binary_op (MODIFY_EXPR, NULL_TREE,
+				TREE_VALUE (gnu_elmt_2),
+				TREE_VALUE (gnu_elmt)));
+	    free_temp_slots ();
+	  }
+      break;
+
     default:
       abort ();
     }