From: David Malcolm <dmalcolm@redhat.com>
Date: Fri, 3 Oct 2014 20:25:30 +0000 (+0000)
Subject: Fix build breakage on darwin introduced by me in r215861
X-Git-Tag: releases/gcc-5.1.0~4283
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acbb0489b6d3db1ff6712fbda32405d45f0b8b30;p=thirdparty%2Fgcc.git

Fix build breakage on darwin introduced by me in r215861

gcc/ChangeLog:
	* gcc.c	(driver::global_initializations): Remove "const" so
	that GCC_DRIVER_HOST_INITIALIZATION can modify decoded_options
	and decoded_options_count.

From-SVN: r215877
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e3d54cde017e..f7c424057736 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-03  David Malcolm  <dmalcolm@redhat.com>
+
+	* gcc.c	(driver::global_initializations): Remove "const" so
+	that GCC_DRIVER_HOST_INITIALIZATION can modify decoded_options
+	and decoded_options_count.
+
 2014-10-03  Maciej W. Rozycki  <macro@codesourcery.com>
 
 	* config/rs6000/e500.h (HARD_REGNO_CALLER_SAVE_MODE): Remove
diff --git a/gcc/gcc.c b/gcc/gcc.c
index f53b92ffd127..71c76f844d1a 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -6737,7 +6737,7 @@ class driver
   void set_progname (const char *argv0) const;
   void expand_at_files (int *argc, char ***argv) const;
   void decode_argv (int argc, const char **argv);
-  void global_initializations () const;
+  void global_initializations ();
   void build_multilib_strings () const;
   void set_up_specs () const;
   void putenv_COLLECT_GCC (const char *argv0) const;
@@ -6848,7 +6848,7 @@ driver::decode_argv (int argc, const char **argv)
 /* Perform various initializations and setup.  */
 
 void
-driver::global_initializations () const
+driver::global_initializations ()
 {
   /* Unlock the stdio streams.  */
   unlock_std_streams ();