cppinit.c (cpp_finish_options): Set first_unused_line to -1.

	* cppinit.c (cpp_finish_options): Set first_unused_line to -1.
testsuite:
	* gcc.dg/cpp/Wunused.c: Update test.

From-SVN: r63985

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2cfa100..0b78805 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-08  Neil Booth  <neil@daikokuya.co.uk>
+
+       * cppinit.c (cpp_finish_options): Set first_unused_line to -1.
+
 2003-03-08  Kazu Hirata  <kazu@cs.umass.edu>
 
        * config/h8300/h8300.md (*extzv_16_8): New.

diff --git a/gcc/cppinit.c b/gcc/cppinit.c
index 76b99b0..5cbd87f 100644 (file)
--- a/gcc/cppinit.c
+++ b/gcc/cppinit.c
@@ -625,6 +625,8 @@ cpp_finish_options (pfile)
     {
       struct pending_option *p;
 
+      /* Prevent -Wunused-macros with command-line redefinitions.  */
+      pfile->first_unused_line = (unsigned int) -1;
       _cpp_do_file_change (pfile, LC_RENAME, _("<built-in>"), 1, 0);
       init_builtins (pfile);
       _cpp_do_file_change (pfile, LC_RENAME, _("<command line>"), 1, 0);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d44271e..5d7b965 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-08  Neil Booth  <neil@daikokuya.co.uk>
+
+       * gcc.dg/cpp/Wunused.c: Update test.
+
 Sat Mar  8 14:18:15 CET 2003  Jan Hubicka  <jh@suse.cz>
 
        * gcc.dg/inline-3.c: New test.

diff --git a/gcc/testsuite/gcc.dg/cpp/Wunused.c b/gcc/testsuite/gcc.dg/cpp/Wunused.c
index aa099ee..ac363ad 100644 (file)
--- a/gcc/testsuite/gcc.dg/cpp/Wunused.c
+++ b/gcc/testsuite/gcc.dg/cpp/Wunused.c
@@ -1,7 +1,8 @@
-/* Copyright (C) 2002 Free Software Foundation, Inc.  */
+/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.  */
 
 /* { dg-do preprocess } */
-/* { dg-options -Wunused-macros } */
+/* Duplicate command line options should not warn.  */
+/* { dg-options "-Wunused-macros -Dfoo -Dfoo" } */
 
 /* Test everything related to -Wunused-macros.