From 408ebd8b33c5ab1ccd4375fd1a6f094113be81d8 Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Fri, 3 Oct 2014 20:25:30 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@215877 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/gcc.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e3d54cde017..f7c42405773 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2014-10-03 David Malcolm + + * 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 * config/rs6000/e500.h (HARD_REGNO_CALLER_SAVE_MODE): Remove diff --git a/gcc/gcc.c b/gcc/gcc.c index f53b92ffd12..71c76f844d1 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 (); -- 2.11.4.GIT