Not directly related to the merge, but I found this out while
fixing it.
We don't need to force the value for LTO_NUM_TAGS and
LTO_LAST_TAG is unnecessary.
Tested and committed together with the latest merge.
Diego.
Do not force the value on LTO_NUM_TAGS.
---
gcc/ChangeLog.pph | 5 +++++
gcc/lto-streamer.h | 5 ++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/gcc/ChangeLog.pph b/gcc/ChangeLog.pph
index 78c7ae8..3494a20 100644
--- a/gcc/ChangeLog.pph
+++ b/gcc/ChangeLog.pph
@@ -2,6 +2,11 @@
Merge from trunk rev 174363.
+2011-05-30 Diego Novillo <dnovi...@google.com>
+
+ * lto-streamer.h (enum LTO_tags): Remove LTO_LAST_TAG.
+ Do not force the value on LTO_NUM_TAGS.
+
2011-05-06 Diego Novillo <dnovi...@google.com>
* lto-streamer-out.c (lto_output_tree): If the streamer
diff --git a/gcc/lto-streamer.h b/gcc/lto-streamer.h
index 9e079a4..c06dcb4 100644
--- a/gcc/lto-streamer.h
+++ b/gcc/lto-streamer.h
@@ -33,7 +33,7 @@ along with GCC; see the file COPYING3. If not see
#include "alloc-pool.h"
#include "gcov-io.h"
-/* Forward declarations to avoid included unnecessary headers. */
+/* Forward declarations to avoid including unnecessary headers. */
struct output_block;
struct lto_input_block;
struct data_in;
@@ -244,10 +244,9 @@ enum LTO_tags
LTO_imported_decl_ref,
LTO_translation_unit_decl_ref,
LTO_global_decl_ref, /* Do not change. */
- LTO_LAST_TAG,
/* This tag must always be last. */
- LTO_NUM_TAGS = LTO_LAST_TAG + MAX_TREE_CODES + LAST_AND_UNUSED_GIMPLE_CODE
+ LTO_NUM_TAGS
};
--
1.7.3.1
