aboutsummaryrefslogtreecommitdiff
path: root/gcc/c-family
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@gcc.gnu.org>2016-01-15 21:57:54 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2016-01-15 21:57:54 +0100
commite0a575ffab61ef4702c3384a1379a32526f63cd3 (patch)
tree3927c071c279417ba6da71ec62c1b8168f4e595f /gcc/c-family
parentafbc5ae887b898d2a828d37e1dd8117a079e8243 (diff)
downloadgcc-e0a575ffab61ef4702c3384a1379a32526f63cd3.zip
gcc-e0a575ffab61ef4702c3384a1379a32526f63cd3.tar.gz
gcc-e0a575ffab61ef4702c3384a1379a32526f63cd3.tar.bz2
re PR bootstrap/68271 (Boostrap fails on x86_64-apple-darwin14 at r230084)
PR bootstrap/68271 * parser.h (cp_token): Remove pragma_kind field. Add comment with number of unused bits. * parser.c (eof_token): Remove pragma_kind field initializer. (cp_lexer_get_preprocessor_token): Don't set pragma_kind field, don't clear CPP_PRAGMA u.value. (cp_parser_pragma_kind): New function. (cp_parser_omp_sections_scope, cp_parser_oacc_kernels_parallel, cp_parser_omp_construct, cp_parser_initial_pragma, cp_parser_pragma): Use cp_parser_pragma_kind instead of accessing pragma_kind field. * c-pragma.c (c_register_pragma_1): Adjust comment to note that C++ FE no longer has limit on number of pragmas. From-SVN: r232451
Diffstat (limited to 'gcc/c-family')
-rw-r--r--gcc/c-family/ChangeLog8
-rw-r--r--gcc/c-family/c-pragma.c5
2 files changed, 10 insertions, 3 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 45ed356..595b92f 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,4 +1,10 @@
-2015-01-14 Ryan Burn <contact@rnburn.com>
+2016-01-15 Jakub Jelinek <jakub@redhat.com>
+
+ PR bootstrap/68271
+ * c-pragma.c (c_register_pragma_1): Adjust comment to note that
+ C++ FE no longer has limit on number of pragmas.
+
+2015-01-14 Ryan Burn <contact@rnburn.com>
PR c++/69048
* cilk.c (create_cilk_wrapper_body): Call fold_build_cleanup_point_expr
diff --git a/gcc/c-family/c-pragma.c b/gcc/c-family/c-pragma.c
index b873664..4e72f65 100644
--- a/gcc/c-family/c-pragma.c
+++ b/gcc/c-family/c-pragma.c
@@ -1372,8 +1372,9 @@ c_register_pragma_1 (const char *space, const char *name,
id = registered_pragmas.length ();
id += PRAGMA_FIRST_EXTERNAL - 1;
- /* The C++ front end allocates 8 bits in cp_token; the C front end
- allocates 8 bits in c_token. At present this is sufficient. */
+ /* The C front end allocates 8 bits in c_token. The C++ front end
+ keeps the pragma kind in the form of INTEGER_CST, so no small
+ limit applies. At present this is sufficient. */
gcc_assert (id < 256);
}