4.9.2-1.1

1 files changed, 8 insertions, 8 deletions

diff --git a/gcc-4.8-filename-output.patch b/gcc-4.8-filename-output.patch
index 6951eb239b77..7c2ee0aa5a58 100644
--- a/gcc-4.8-filename-output.patch
+++ b/gcc-4.8-filename-output.patch
@@ -1,17 +1,17 @@
---- gcc/c-family/c-opts.c       (revision 200330)
-+++ gcc/c-family/c-opts.c       (working copy)
-@@ -1338,10 +1338,14 @@ c_finish_options (void)
-
- /* Give CPP the next file given by -include, if any.  */
+diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c
+index 968b703..3f8e6e6 100644
+--- a/gcc/c-family/c-opts.c
++++ b/gcc/c-family/c-opts.c
+@@ -1438,6 +1438,12 @@ c_finish_options (void)
  static void
  push_command_line_include (void)
  {
-+  // This can happen if disabled by -imacros for example.
++  /* This can happen if disabled by -imacros for example.
++     Punt so that we don't set "<command-line>" as the filename for
++     the header.  */
 +  if (include_cursor > deferred_count)
 +    return;
 +
    if (!done_preinclude)
      {
        done_preinclude = true;
-       if (flag_hosted && std_inc && !cpp_opts->preprocessed)
-        {