From 0c5e3a3d7a2fd55eb181c35ea7423fdb0c3e3b61 Mon Sep 17 00:00:00 2001 From: uros Date: Wed, 9 Nov 2005 06:30:03 +0000 Subject: libcpp/ PR c/24101 * init.c (read_original_filename): Temporarily set state.in_directive before calling _cpp_lex_direct for CPP_HASH tokens. gcc/ PR c/24101 * toplev.c (process_options): Initialize debug_hooks early in case lang_hooks.post_options ends up calling a debug_hook. gcc/testsuite/ PR c/24101 * gcc.dg/pr24101-1.i, gcc.dg/pr24101-2.i: New tests. * gcc.dg/dg.exp: Run main loop also for *.i files. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@106677 138bc75d-0d04-0410-961f-82ee72b054a4 --- libcpp/ChangeLog | 8 ++++++++ libcpp/init.c | 2 ++ 2 files changed, 10 insertions(+) (limited to 'libcpp') diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 3b14dabf134..747e45adc72 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,11 @@ +2005-11-09 Per Bothner + Uros Bizjak + + PR c/24101 + * init.c (read_original_filename): Temporarily set + state.in_directive before calling _cpp_lex_direct for + CPP_HASH tokens. + 2005-11-03 James E Wilson PR preprocessor/24202 diff --git a/libcpp/init.c b/libcpp/init.c index 3074f96b5c8..bbf2705b46c 100644 --- a/libcpp/init.c +++ b/libcpp/init.c @@ -497,8 +497,10 @@ read_original_filename (cpp_reader *pfile) token = _cpp_lex_direct (pfile); if (token->type == CPP_HASH) { + pfile->state.in_directive = 1; token1 = _cpp_lex_direct (pfile); _cpp_backup_tokens (pfile, 1); + pfile->state.in_directive = 0; /* If it's a #line directive, handle it. */ if (token1->type == CPP_NUMBER) -- cgit v1.2.3