lang.opt (nostdlib): Move around.

	* lang.opt (nostdlib): Move around.
	* misc.c (gnat_handle_option): Fix formatting.
	(gnat_dwarf_name): Move around.
	* trans.c (Case_Statement_to_gnu): Fix formatting.
	(gnat_to_gnu): Likewise.
	* utils.c (aggregate_type_contains_array_p): Likewise.
	(create_subprog_decl): Likewise.

From-SVN: r133035

gcc/ada/ChangeLog

 2008-03-08  Eric Botcazou  <ebotcazou@adacore.com>
 
+	* lang.opt (nostdlib): Move around.
+	* misc.c (gnat_handle_option): Fix formatting.
+	(gnat_dwarf_name): Move around.
+	* trans.c (Case_Statement_to_gnu): Fix formatting.
+	(gnat_to_gnu): Likewise.
+	* utils.c (aggregate_type_contains_array_p): Likewise.
+	(create_subprog_decl): Likewise.
+
+2008-03-08  Eric Botcazou  <ebotcazou@adacore.com>
+
 	* decl.c (gnat_to_gnu_entity) <E_Signed_Integer_Subtype>: Do not
 	bother propagating the TYPE_USER_ALIGN flag when creating a JM type.
 

gcc/ada/ada-tree.def

@@ -6,7 +6,7 @@
  *                                                                          *
  *                              Specification                               *
  *                                                                          *
- *          Copyright (C) 1992-2004, 2007 Free Software Foundation, Inc.    *
+ *            Copyright (C) 1992-2007, Free Software Foundation, Inc.       *
  *                                                                          *
  * GNAT 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- *

gcc/ada/ada.h

@@ -6,7 +6,7 @@
  *                                                                          *
  *                              C Header File                               *
  *                                                                          *
- *          Copyright (C) 1992-2003 Free Software Foundation, Inc.          *
+ *          Copyright (C) 1992-2008, Free Software Foundation, Inc.         *
  *                                                                          *
  * GNAT 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- *

gcc/ada/lang.opt

@@ -69,16 +69,16 @@ nostdinc
 Ada RejectNegative
 ; Don't look for source files
 
+nostdlib
+Ada
+; Don't look for object files
+
 feliminate-unused-debug-types
 Ada
 ; Effect documented for C - intercepted for Ada to force the associated flag
 ; not to be set by default, as it currently eliminates unreferenced parallel
 ; types we need for encoding descriptions to the debugger.
 
-nostdlib
-Ada
-; Don't look for object files
-
 fRTS=
 Ada Joined RejectNegative
 ; Selects the runtime

gcc/ada/misc.c

@@ -6,7 +6,7 @@
  *                                                                          *
  *                           C Implementation File                          *
  *                                                                          *
- *          Copyright (C) 1992-2007, Free Software Foundation, Inc.         *
+ *          Copyright (C) 1992-2008, Free Software Foundation, Inc.         *
  *                                                                          *
  * GNAT 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- *
@@ -527,7 +527,6 @@ gnat_init_gcc_eh (void)
      marked as "cannot trap" if the flag is not set (see emit_libcall_block).
      We should not let this be since it is possible for such calls to actually
      raise in Ada.  */
-
   flag_exceptions = 1;
   flag_non_call_exceptions = 1;
 
@@ -615,6 +614,14 @@ gnat_print_type (FILE *file, tree node, int indent)
 }
 
 static const char *
+gnat_dwarf_name (tree t, int verbosity ATTRIBUTE_UNUSED)
+{
+  gcc_assert (DECL_P (t));
+
+  return (const char *) IDENTIFIER_POINTER (DECL_NAME (t));
+}
+
+static const char *
 gnat_printable_name (tree decl, int verbosity)
 {
   const char *coded_name = IDENTIFIER_POINTER (DECL_NAME (decl));
@@ -631,14 +638,6 @@ gnat_printable_name (tree decl, int verbosity)
   return (const char *) ada_name;
 }
 
-static const char *
-gnat_dwarf_name (tree t, int verbosity ATTRIBUTE_UNUSED)
-{
-  gcc_assert (DECL_P (t));
-
-  return (const char *) IDENTIFIER_POINTER (DECL_NAME (t));
-}
-
 /* Expands GNAT-specific GCC tree nodes.  The only ones we support
    here are  and NULL_EXPR.  */
 

gcc/ada/trans.c

@@ -1528,14 +1528,13 @@ Case_Statement_to_gnu (Node_Id gnat_node)
 	    }
 
 	  /* If the case value is a subtype that raises Constraint_Error at
-             run-time because of a wrong bound, then gnu_low or gnu_high
-             is not translated into an INTEGER_CST.  In such a case, we need
+	     run-time because of a wrong bound, then gnu_low or gnu_high is
+	     not transtaleted into an INTEGER_CST.  In such a case, we need
 	     to ensure that the when statement is not added in the tree,
 	     otherwise it will crash the gimplifier.  */
 	  if ((!gnu_low || TREE_CODE (gnu_low) == INTEGER_CST)
 	      && (!gnu_high || TREE_CODE (gnu_high) == INTEGER_CST))
 	    {
-
 	      add_stmt_with_node (build3 (CASE_LABEL_EXPR, void_type_node,
 					  gnu_low, gnu_high,
 					  create_artificial_label ()),
@@ -1544,10 +1543,9 @@ Case_Statement_to_gnu (Node_Id gnat_node)
 	    }
 	}
 
-      /* Push a binding level here in case variables are declared since we want
-         them to be local to this set of statements instead of the block
+      /* Push a binding level here in case variables are declared as we want
+	 them to be local to this set of statements instead of to the block
 	 containing the Case statement.  */
-
       if (choices_added > 0)
 	{
 	  add_stmt (build_stmt_group (Statements (gnat_when), true));
@@ -6299,7 +6297,7 @@ assoc_to_constructor (Entity_Id gnat_entity, Node_Id gnat_assoc, tree gnu_type)
   {
     tree gnu_field;
 
-    /* Verify every enty in GNU_LIST was used.  */
+    /* Verify every entry in GNU_LIST was used.  */
     for (gnu_field = gnu_list; gnu_field; gnu_field = TREE_CHAIN (gnu_field))
       gcc_assert (TREE_ADDRESSABLE (gnu_field));
   }