+2012-07-20  Ryan Mansfield  <rmansfield@qnx.com>
+
+       * gcc.c (main): Move GCC_DRIVER_HOST_INITIALIZATION after
+       diagnostic_initialize.
+
 2012-07-27  Oleg Endo  <olegendo@gcc.gnu.org>
 
        PR target/54089
 
                                   CL_DRIVER,
                                   &decoded_options, &decoded_options_count);
 
-#ifdef GCC_DRIVER_HOST_INITIALIZATION
-  /* Perform host dependent initialization when needed.  */
-  GCC_DRIVER_HOST_INITIALIZATION;
-#endif
-
   /* Unlock the stdio streams.  */
   unlock_std_streams ();
 
   gcc_init_libintl ();
 
   diagnostic_initialize (global_dc, 0);
+
+#ifdef GCC_DRIVER_HOST_INITIALIZATION
+  /* Perform host dependent initialization when needed.  */
+  GCC_DRIVER_HOST_INITIALIZATION;
+#endif
+
   if (atexit (delete_temp_files) != 0)
     fatal_error ("atexit failed");