Tree broken by (partial) gomp merge

[Richard Guenther]

gcc -c   -g -fno-inline -DIN_GCC   -W -Wall -Wwrite-strings 
-Wstrict-prototypes -Wmissing-prototypes -pedantic -Wno-long-long 
-Wno-variadic-macros -Wold-style-definition -Wmissing-format-attribute 
-fno-common   -DHAVE_CONFIG_H -I. -I. -I../../../src/svn/gcc/gcc 
-I../../../src/svn/gcc/gcc/. -I../../../src/svn/gcc/gcc/../include 
-I../../../src/svn/gcc/gcc/../libcpp/include  
-I../../../src/svn/gcc/gcc/../libdecnumber -I../libdecnumber    
../../../src/svn/gcc/gcc/c-lex.c -o c-lex.o
../../../src/svn/gcc/gcc/c-lex.c: In function ‘c_lex_with_flags’:
../../../src/svn/gcc/gcc/c-lex.c:465: error: ‘union cpp_token_u’ has 
no member named ‘pragma’
make[1]: *** [c-lex.o] Error 1


Looks like a libcpp part to

2006-01-04  Richard Henderson  <[EMAIL PROTECTED]>

        Merge from gomp branch:
        * c-lex.c (c_lex_with_flags) <CPP_PRAGMA>: Smuggle pragma id
        via integer constant.
        (pragma_lex): Remove.
        * c-pch.c (c_common_pch_pragma): Accept the name as an argument,
        rather than parsing it.
        * c-pragma.c (handle_pragma_weak, handle_pragma_redefine_extname,
        handle_pragma_extern_prefix): Add %< %> quotes.
        (registered_pragmas): New.
        (c_register_pragma_1): New.
        (c_register_pragma): Use it.
        (c_register_pragma_with_expansion): Likewise.
        (c_invoke_pragma_handler): New.
        (init_pragma): Use cpp_register_deferred_pragma directly for
        pch_preprocess.
        * c-pragma.h (enum pragma_kind): New.
        (pragma_handler): New.
        (c_invoke_pragma_handler): Declare.
        * c-common.c (c_parse_error): Pretty print CPP_PRAGMA and
        CPP_PRAGMA_EOL.
...

is missing.

Richard.