* gcc-interface/misc.c (optimize, optimize_size): Undefine as

	macros and define as variables.
	(gnat_post_options): Set optimize and optimize_size variables.

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

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 52be3a9..36389f4 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-30  Joseph Myers  <joseph@codesourcery.com>
+
+       * gcc-interface/misc.c (optimize, optimize_size): Undefine as
+       macros and define as variables.
+       (gnat_post_options): Set optimize and optimize_size variables.
+

 2010-09-28  Joel Sherrill <joel.sherrill@oarcorp.com>
 
        * g-socket.adb: Move pragma to disable warnings in case
 2010-09-28  Joel Sherrill <joel.sherrill@oarcorp.com>
 
        * g-socket.adb: Move pragma to disable warnings in case

diff --git a/gcc/ada/gcc-interface/misc.c b/gcc/ada/gcc-interface/misc.c
index 1819977..a991fba 100644 (file)
--- a/gcc/ada/gcc-interface/misc.c
+++ b/gcc/ada/gcc-interface/misc.c
@@ -303,6 +303,13 @@ gnat_init_options (unsigned int decoded_options_count,
   flag_zero_initialized_in_bss = 0;
 }
 
   flag_zero_initialized_in_bss = 0;
 }
 

+/* Ada code requires variables for these settings rather than elements
+   of the global_options structure.  */
+#undef optimize
+#undef optimize_size
+int optimize;
+int optimize_size;
+

 /* Post-switch processing.  */
 
 static bool
 /* Post-switch processing.  */
 
 static bool


@@ -334,6 +341,9 @@ gnat_post_options (const char **pfilename ATTRIBUTE_UNUSED)
   if (write_symbols == DWARF2_DEBUG)
     use_gnu_debug_info_extensions = gnat_dwarf_extensions > 0;
 
   if (write_symbols == DWARF2_DEBUG)
     use_gnu_debug_info_extensions = gnat_dwarf_extensions > 0;
 

+  optimize = global_options.x_optimize;
+  optimize_size = global_options.x_optimize_size;
+

   return false;
 }
 
   return false;
 }