bindgen.adb (Gen_Main_Ada, Gen_Main_C): Do not test Bind_Main_Program.

	* bindgen.adb (Gen_Main_Ada, Gen_Main_C): Do not test
	Bind_Main_Program.

From-SVN: r68061

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index aaadc708f7297180f158c410f990062e560fdd91..2ac17b060c5df372330670315a5b3e6684d467d0 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-16  Matt Kraai  <kraai@alumni.cmu.edu>
+
+       * bindgen.adb (Gen_Main_Ada, Gen_Main_C): Do not test
+       Bind_Main_Program.
+
 2003-06-15  Neil Booth  <neil@daikokuya.co.uk>
 
        * lang.opt: Declare Ada.

diff --git a/gcc/ada/bindgen.adb b/gcc/ada/bindgen.adb
index abfb0af9cff5f1bb0c9b3647df80fcdc4e8dd84c..08e4e7755f3c4d2a6451d4ae8ed7a0893adcf850 100644 (file)
--- a/gcc/ada/bindgen.adb
+++ b/gcc/ada/bindgen.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2002 Free Software Foundation, Inc.          --
+--          Copyright (C) 1992-2003 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- --
@@ -1245,12 +1245,10 @@ package body Bindgen is
       --  The reference stops Ada_Main_Program_Name from being optimized
       --  away by smart linkers, such as the AiX linker.
 
-      if Bind_Main_Program then
-         WBI
-           ("      Ensure_Reference : System.Address := " &
-            "Ada_Main_Program_Name'Address;");
-         WBI ("");
-      end if;
+      WBI
+        ("      Ensure_Reference : System.Address := " &
+         "Ada_Main_Program_Name'Address;");
+      WBI ("");
 
       WBI ("   begin");
 
@@ -1366,12 +1364,10 @@ package body Bindgen is
          --  place). The reference stops Ada_Main_Program_Name from being
          --  optimized away by smart linkers, such as the AiX linker.
 
-         if Bind_Main_Program then
-            WBI
-              ("   char *ensure_reference __attribute__ ((__unused__)) = " &
-               "__gnat_ada_main_program_name;");
-            WBI ("");
-         end if;
+         WBI
+           ("   char *ensure_reference __attribute__ ((__unused__)) = " &
+            "__gnat_ada_main_program_name;");
+         WBI ("");
 
          if ALIs.Table (ALIs.First).Main_Program = Func then
             WBI ("   int result;");