* BASE-VER: Set to 6.0.1.

	* DEV-PHASE: Set to prerelease.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@235036 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/BASE-VER b/gcc/BASE-VER
index 09b254e..5fe6072 100644 (file)
--- a/gcc/BASE-VER
+++ b/gcc/BASE-VER
@@ -1 +1 @@
-6.0.0
+6.0.1

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a73fa88..8026e73 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,18 +1,7 @@
-2016-04-15  Jason Merrill  <jason@redhat.com>
-           Nathan Sidwell  <nathan@acm.org>
+2016-04-15  Jakub Jelinek  <jakub@redhat.com>
 
-       PR c++/70594
-       * constexpr.c (constexpr_call_table): Preserve in GC.
-       (struct fundef_copy, struct fundef_copies_table_t):     Delete.
-       (fundef_copies_table): Preserve in GC. Change to pointer to
-       tree->tree hash.
-       (maybe_initialize_fundef_copies_table): Adjust.
-       (get_fundef_copy): Return a TREE_LIST.  Use non-inserting search.
-       (save_fundef_copy): Adjust for a TREE_LIST.
-       (cxx_eval_call_expression): Adjust for a fundef_copy TREE_LIST.
-       (fini_constexpr): New.
-       * cp-tree.h (fini_constexpr): Declare.
-       * decl2.c (c_parse_final_cleanups): Call fini_constexpr.
+       * BASE-VER: Set to 6.0.1.
+       * DEV-PHASE: Set to prerelease.
 
 2016-04-15  Alexander Monakov  <amonakov@ispras.ru>
 

diff --git a/gcc/DEV-PHASE b/gcc/DEV-PHASE
index 9839eb2..373fbc6 100644 (file)
--- a/gcc/DEV-PHASE
+++ b/gcc/DEV-PHASE
@@ -1 +1 @@
-experimental
+prerelease

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d89b73b..cb09158 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,19 @@
+2016-04-15  Jason Merrill  <jason@redhat.com>
+           Nathan Sidwell  <nathan@acm.org>
+
+       PR c++/70594
+       * constexpr.c (constexpr_call_table): Preserve in GC.
+       (struct fundef_copy, struct fundef_copies_table_t):     Delete.
+       (fundef_copies_table): Preserve in GC. Change to pointer to
+       tree->tree hash.
+       (maybe_initialize_fundef_copies_table): Adjust.
+       (get_fundef_copy): Return a TREE_LIST.  Use non-inserting search.
+       (save_fundef_copy): Adjust for a TREE_LIST.
+       (cxx_eval_call_expression): Adjust for a fundef_copy TREE_LIST.
+       (fini_constexpr): New.
+       * cp-tree.h (fini_constexpr): Declare.
+       * decl2.c (c_parse_final_cleanups): Call fini_constexpr.
+
 2016-04-15  Jakub Jelinek  <jakub@redhat.com>
 
        PR c/70436