* gcc-interfaces/utils.c (create_subprog_decl): Do not redefine

	main_identifier_node.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@153052 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 83ed69e..6fef8cc 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-21  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * gcc-interfaces/utils.c (create_subprog_decl): Do not redefine
+       main_identifier_node.
+

 2009-10-17  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gcc-interface/utils.c (convert): When converting to a padded type
 2009-10-17  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gcc-interface/utils.c (convert): When converting to a padded type

diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c
index a8225b0..b1e2e58 100644 (file)
--- a/gcc/ada/gcc-interface/utils.c
+++ b/gcc/ada/gcc-interface/utils.c
@@ -1866,9 +1866,9 @@ create_subprog_decl (tree subprog_name, tree asm_name,
         to be declared as the "main" function literally by default.  Ada
         program entry points are typically declared with a different name
         within the binder generated file, exported as 'main' to satisfy the
         to be declared as the "main" function literally by default.  Ada
         program entry points are typically declared with a different name
         within the binder generated file, exported as 'main' to satisfy the

-        system expectations.  Redirect main_identifier_node in this case.  */
+        system expectations.  Force main_identifier_node in this case.  */

       if (asm_name == main_identifier_node)
       if (asm_name == main_identifier_node)

-       main_identifier_node = DECL_NAME (subprog_decl);
+       DECL_NAME (subprog_decl) = main_identifier_node;

     }
 
   process_attributes (subprog_decl, attr_list);
     }
 
   process_attributes (subprog_decl, attr_list);