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

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 0a99798d5fa918dfbf695fdc436cf68551d26755..ed2ba46371c0f74213d39a8d03ab0571755e0b54 100644 (file)
--- 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 26f001abbe52a1b3fa6f3e5a6272092de7955e90..f86ed3844229f51b81fe38d49e404da529eed66a 100644 (file)
--- 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 b2f8b64e2c747aaf495cae17b13e578fd58411d1..a170685c32501c593dcf8beb3c77bfa01a5e14ea 100644 (file)
--- 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 fdbff6664ef3268c23549e6d3e4c72e35df93d7d..022d03787a81b13da9fd5fd638926c5e0c58eab4 100644 (file)
--- 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