diff options
| author | Neil Booth <neil@daikokuya.co.uk> | 2003-04-03 22:01:21 +0000 |
|---|---|---|
| committer | Neil Booth <neil@gcc.gnu.org> | 2003-04-03 22:01:21 +0000 |
| commit | 7b43d10453a4d67ec5c99cc8d0124dd12c222671 (patch) | |
| tree | 5f652ace4bcc594e7a186a0d07e0e9752580ace1 | |
| parent | d24ecd21b30e9e914788443666912d4dee5be6bc (diff) | |
| download | gcc-7b43d10453a4d67ec5c99cc8d0124dd12c222671.zip gcc-7b43d10453a4d67ec5c99cc8d0124dd12c222671.tar.gz gcc-7b43d10453a4d67ec5c99cc8d0124dd12c222671.tar.bz2 | |
* fix-header.c (read_scan_file): Defer switch processing.
From-SVN: r65216
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/fix-header.c | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0760413..616b1a0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2003-04-03 Neil Booth <neil@daikokuya.co.uk> + + * fix-header.c (read_scan_file): Defer switch processing. + 2003-04-03 Matt Austern <austern@apple.com> * cpppch.c (reset_ht): Remove. diff --git a/gcc/fix-header.c b/gcc/fix-header.c index 423cd57..033019e 100644 --- a/gcc/fix-header.c +++ b/gcc/fix-header.c @@ -635,6 +635,11 @@ read_scan_file (in_fname, argc, argv) if (! cpp_read_main_file (scan_in, in_fname)) exit (FATAL_EXIT_CODE); + cpp_change_file (scan_in, LC_RENAME, "<built-in>"); + cpp_init_builtins (scan_in); + cpp_change_file (scan_in, LC_RENAME, in_fname); + + /* Process switches after builtins so -D can override them. */ for (i = 0; i < argc; i += strings_processed) { strings_processed = 0; @@ -675,10 +680,6 @@ read_scan_file (in_fname, argc, argv) true /* stdinc */, false /* cxx_stdinc */, false /* verbose */); - cpp_change_file (scan_in, LC_RENAME, "<built-in>"); - cpp_init_builtins (scan_in); - cpp_change_file (scan_in, LC_RENAME, in_fname); - /* We are scanning a system header, so mark it as such. */ cpp_make_system_header (scan_in, 1, 0); |