re PR c/57653 (filename information discarded when using -imacros)

	PR c/57653
	* c-opts.c (c_finish_options): If -imacros is in effect, return.

	* c-c++-common/pr57653.c: New test.
	* c-c++-common/pr57653.h: New file.
	* c-c++-common/pr57653-2.c: New test.
	* c-c++-common/pr57653-2.h: New file.

From-SVN: r212972

gcc/c-family/ChangeLog

+2014-07-24  Marek Polacek  <polacek@redhat.com>
+
+	PR c/57653
+	* c-opts.c (c_finish_options): If -imacros is in effect, return.
+
 2014-07-16  Dodji Seketeli  <dodji@redhat.com>
 
 	PR preprocessor/60723 - missing system-ness marks for macro tokens

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.
+     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;

gcc/testsuite/ChangeLog

+2014-07-24  Marek Polacek  <polacek@redhat.com>
+
+	PR c/57653
+	* c-c++-common/pr57653.c: New test.
+	* c-c++-common/pr57653.h: New file.
+	* c-c++-common/pr57653-2.c: New test.
+	* c-c++-common/pr57653-2.h: New file.
+
 2014-07-23  Jiong Wang  <jiong.wang@arm.com>
 
 	* gcc.target/aarch64/test_frame_common.h: New file.

gcc/testsuite/c-c++-common/pr57653-2.c

+/* { dg-do preprocess } */
+/* { dg-options "-imacros ${srcdir}/c-c++-common/pr57653-2.h" } */
+
+/* Empty.  */

gcc/testsuite/c-c++-common/pr57653-2.h

+

gcc/testsuite/c-c++-common/pr57653.c

+/* { dg-do compile } */
+/* { dg-options "-imacros ${srcdir}/c-c++-common/pr57653.h" } */
+
+__attribute__((used)) static const char s[] = F;
+
+/* { dg-final { scan-assembler-not "command-line" } } */

gcc/testsuite/c-c++-common/pr57653.h

+#define F __FILE__