diff options
| author | Dominique d'Humieres <dominiq@lps.ens.fr> | 2015-11-11 15:30:16 +0100 |
|---|---|---|
| committer | Dominique d'Humieres <dominiq@gcc.gnu.org> | 2015-11-11 15:30:16 +0100 |
| commit | 4ac93c7cf665ea0dfb2313ccd8216afb9a4a5763 (patch) | |
| tree | 6ca3a9e06f9b9efec5c30e00e27fc5787c4d924f | |
| parent | bd94906f987eb065dd6d4e9cadef82f7513d05cd (diff) | |
| download | gcc-4ac93c7cf665ea0dfb2313ccd8216afb9a4a5763.zip gcc-4ac93c7cf665ea0dfb2313ccd8216afb9a4a5763.tar.gz gcc-4ac93c7cf665ea0dfb2313ccd8216afb9a4a5763.tar.bz2 | |
re PR bootstrap/68271 (Boostrap fails on x86_64-apple-darwin14 at r230084)
gcc/cp/ChangeLog
2015-11-11 Dominique d'Humieres <dominiq@lps.ens.fr>
PR bootstrap/68271
* parser.h (cp_token): Update pragma_kind to 8.
gcc/c-family/ChangeLog
2015-11-11 Dominique d'Humieres <dominiq@lps.ens.fr>
PR bootstrap/68271
* c-pragma.c (c_register_pragma_1): Update the gcc_assert to 256.
From-SVN: r230172
| -rw-r--r-- | gcc/c-family/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/c-family/c-pragma.c | 6 | ||||
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/parser.h | 2 |
4 files changed, 14 insertions, 4 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 0a99798..ed2ba46 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,8 @@ +2015-11-11 Dominique d'Humieres <dominiq@lps.ens.fr> + + PR bootstrap/68271 + * c-pragma.c (c_register_pragma_1): Update the gcc_assert to 256. + 2015-11-11 Andrew MacLeod <amacleod@redhat.com> * array-notation-common.c: Remove unused header files. diff --git a/gcc/c-family/c-pragma.c b/gcc/c-family/c-pragma.c index 26f001a..f86ed38 100644 --- a/gcc/c-family/c-pragma.c +++ b/gcc/c-family/c-pragma.c @@ -1366,9 +1366,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 6 bits in cp_token; the C front end - allocates 7 bits in c_token. At present this is sufficient. */ - gcc_assert (id < 64); + /* 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. */ + gcc_assert (id < 256); } cpp_register_deferred_pragma (parse_in, space, name, id, diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b2f8b64..a170685 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2015-11-11 Dominique d'Humieres <dominiq@lps.ens.fr> + + PR bootstrap/68271 + * parser.h (cp_token): Update pragma_kind to 8. + 2015-11-11 Andrew MacLeod <amacleod@redhat.com> * call.c: Remove unused header files. diff --git a/gcc/cp/parser.h b/gcc/cp/parser.h index fdbff66..022d037 100644 --- a/gcc/cp/parser.h +++ b/gcc/cp/parser.h @@ -48,7 +48,7 @@ struct GTY (()) cp_token { /* Token flags. */ unsigned char flags; /* Identifier for the pragma. */ - ENUM_BITFIELD (pragma_kind) pragma_kind : 6; + ENUM_BITFIELD (pragma_kind) pragma_kind : 8; /* True if this token is from a context where it is implicitly extern "C" */ BOOL_BITFIELD implicit_extern_c : 1; /* True if an error has already been reported for this token, such as a |