diff options
| author | Neil Booth <neil@daikokuya.co.uk> | 2002-06-25 06:00:30 +0000 |
|---|---|---|
| committer | Neil Booth <neil@gcc.gnu.org> | 2002-06-25 06:00:30 +0000 |
| commit | 0c6db54457ac526c5ec8b8ca5b6b8a5104eccce7 (patch) | |
| tree | 72f86a445f4678c5b6afc75667e751ee6dcaf2a2 /gcc/cpplib.c | |
| parent | d74bba04e8561896d2ba0ec5170216a38e1fd352 (diff) | |
| download | gcc-0c6db54457ac526c5ec8b8ca5b6b8a5104eccce7.zip gcc-0c6db54457ac526c5ec8b8ca5b6b8a5104eccce7.tar.gz gcc-0c6db54457ac526c5ec8b8ca5b6b8a5104eccce7.tar.bz2 | |
cpplib.c (do_include_common): Revert to correct line number if -traditional.
* cpplib.c (do_include_common): Revert to correct line number
if -traditional.
* cpptrad.c (scan_out_logical_line): Treat null directive as
white space. Invlidate MI optimization for non-whitespace
text outside a directive.
testsuite:
* gcc.dg/cpp/mi7.c, gcc.dg/cpp/mi7a.h, gcc.dg/cpp/mi7b.h,
gcc.dg/cpp/trad/builtins.c, gcc.dg/cpp/trad/builtins.h,
gcc.dg/cpp/trad/cmdlne-C.c, gcc.dg/cpp/trad/cmdlne-C2.c,
gcc.dg/cpp/trad/maccom1.c, gcc.dg/cpp/trad/maccom2.c,
gcc.dg/cpp/trad/maccom3.c, gcc.dg/cpp/trad/maccom4.c,
gcc.dg/cpp/trad/maccom6.c, gcc.dg/cpp/trad/mi1.c,
gcc.dg/cpp/trad/mi1c.h, gcc.dg/cpp/trad/mi1nd.h,
gcc.dg/cpp/trad/mi1ndp.h, gcc.dg/cpp/trad/mi1x.h,
gcc.dg/cpp/trad/mi2.c, gcc.dg/cpp/trad/mi2a.h,
gcc.dg/cpp/trad/mi2b.h, gcc.dg/cpp/trad/mi2c.h
gcc.dg/cpp/trad/mi3.c, gcc.dg/cpp/trad/mi3.def,
gcc.dg/cpp/trad/mi3.h, gcc.dg/cpp/trad/mi4.c,
gcc.dg/cpp/trad/mi5.c, gcc.dg/cpp/trad/mi6.c,
gcc.dg/cpp/trad/mi6a.h, gcc.dg/cpp/trad/mi6b.h,
gcc.dg/cpp/trad/mi6c.h, gcc.dg/cpp/trad/mi6d.h,
gcc.dg/cpp/trad/mi6e.h, gcc.dg/cpp/trad/mi7.c,
gcc.dg/cpp/trad/mi7a.h, gcc.dg/cpp/trad/mi7b.h: New tests.
From-SVN: r54978
Diffstat (limited to 'gcc/cpplib.c')
| -rw-r--r-- | gcc/cpplib.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gcc/cpplib.c b/gcc/cpplib.c index 59e2fe6..18e44ba 100644 --- a/gcc/cpplib.c +++ b/gcc/cpplib.c @@ -705,6 +705,9 @@ do_include_common (pfile, type) (*pfile->cb.include) (pfile, pfile->directive_line, pfile->directive->name, header); + /* Revert to the correct line if traditional. */ + if (CPP_OPTION (pfile, traditional)) + pfile->line = pfile->saved_line; _cpp_execute_include (pfile, header, type); } } |