diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 39f46c431922e66f46ce453d716c677c0e490c63..68ad244ba5716239218dabc515a25d42a58f51a9 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2021-04-20  Jakub Jelinek  <jakub@redhat.com>
+
+	* gcc-changelog/git_update_version.py (active_refs): Add
+	releases/gcc-11.
+
 2021-04-12  Martin Liska  <mliska@suse.cz>
 
 	* gcc-changelog/git_commit.py: Do not allow space in long lines.
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 015f9a3c1a7831701adb91874d1517e6539f488b..07996a25689b8b386c6875b291edac773981783e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,30 @@
+2021-04-20  H.J. Lu  <hjl.tools@gmail.com>
+
+	* config/i386/i386-c.c (ix86_target_macros_internal): Define
+	__CRC32__ for -mcrc32.
+	* config/i386/i386-options.c (ix86_option_override_internal):
+	Enable crc32 instruction for -msse4.2.
+	* config/i386/i386.md (sse4_2_crc32<mode>): Remove TARGET_SSE4_2
+	check.
+	(sse4_2_crc32di): Likewise.
+	* config/i386/ia32intrin.h: Use crc32 target option for CRC32
+	intrinsics.
+
+2021-04-20  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	PR target/100108
+	* config/rs6000/rs6000.c (rs6000_machine_from_flags): Do not consider
+	OPTION_MASK_ISEL.
+
+2021-04-20  Martin Liska  <mliska@suse.cz>
+
+	* doc/invoke.texi: Fix typo.
+	* params.opt: Likewise.
+
+2021-04-20  Martin Liska  <mliska@suse.cz>
+
+	* doc/invoke.texi: Document new param.
+
 2021-04-19  Andrew MacLeod  <amacleod@redhat.com>
 
 	PR tree-optimization/100081
diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index b392715811cfbd607daa433cc1014b301b382bb1..1c1820ff172e56776965df04aafb71eb7c1d0e80 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20210420
+20210421
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index d64ae068b7ae9ad21b089acce9515b6907c926f9..55ef853947e00ec351ff628610dc7361c2aa1252 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-20  Martin Liska  <mliska@suse.cz>
+
+	* gnatvsn.ads: Bump Library_Version to 12.
+
 2021-04-13  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gcc-interface/misc.c (gnat_init): Set default range bits to 0.
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 335018c64039998a694d1ca28551047db2daafa7..2bfd78b4ac2fb6775afc031af0e4daf592f89e59 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2021-04-20  Jason Merrill  <jason@redhat.com>
+
+	PR c++/100109
+	* pt.c (find_parameter_packs_r): Look into enum initializers.
+
 2021-04-19  Marek Polacek  <polacek@redhat.com>
 
 	PR c++/97536
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 2e615040cefad0669ffdcf374e82087ff9491e27..17803977013445f24874dd22799f66e79c6550fe 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2021-04-20  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/100110
+	* trans-decl.c (gfc_get_symbol_decl): Replace test for host
+	association with a check that the current and symbol namespaces
+	are the same.
+
 2021-04-19  Thomas Schwinge  <thomas@codesourcery.com>
 
 	* lang.opt (fopenacc-kernels=): Remove.
diff --git a/gcc/po/ChangeLog b/gcc/po/ChangeLog
index 848d446be5a85e72843676dd578015d11e9b8708..d3638edb5fd5af93d2934625c66567562ab6edf8 100644
--- a/gcc/po/ChangeLog
+++ b/gcc/po/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-20  Joseph Myers  <joseph@codesourcery.com>
+
+	* gcc.pot: Regenerate.
+
 2021-04-12  Joseph Myers  <joseph@codesourcery.com>
 
 	* sv.po: Update.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 29c90df952ca65ce06a1c339497ca3360483df11..caa346a3ad8e6e8fcd9e76b1dca3d4f44579c88d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,20 @@
+2021-04-20  Jason Merrill  <jason@redhat.com>
+
+	PR c++/100109
+	* g++.dg/cpp0x/lambda/lambda-variadic14.C: New test.
+
+2021-04-20  Stefan Schulze Frielinghaus  <stefansf@linux.ibm.com>
+
+	* gcc.target/s390/zero-scratch-regs-1.c: Force test to run for
+	z/Architecture only.
+
+2021-04-20  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/100110
+	* gfortran.dg/pdt_31.f03: New test.
+	* gfortran.dg/pdt_26.f03: Reduce 'builtin_malloc' count from 9
+	to 8.
+
 2021-04-19  Marek Polacek  <polacek@redhat.com>
 
 	PR c++/97536
diff --git a/libphobos/ChangeLog b/libphobos/ChangeLog
index 56f7de524d406b0e88e0d17e88161ec4ce659f73..ddb1830bf6277e52c6af5dacb64494738468bd0a 100644
--- a/libphobos/ChangeLog
+++ b/libphobos/ChangeLog
@@ -1,3 +1,17 @@
+2021-04-20  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	PR d/98584
+	* libdruntime/gcc/deh.d (scanLSDA): Update calls to read_uleb128 and
+	read_encoded_value.
+	(actionTableLookup): Update calls to read_sleb128 and
+	read_encoded_value_with_base.
+	* libdruntime/gcc/unwind/pe.d (read_uleb128): Update signature.
+	(read_sleb128): Update signature.
+	(read_unaligned): New function.
+	(read_encoded_value_with_base): Update signature.  Call read_unaligned
+	instead of unsafe pointer dereferencing.
+	(read_encoded_value): Update signature.
+
 2021-04-19  Iain Buclaw  <ibuclaw@gdcproject.org>
 
 	PR d/98494
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7edf1179cc152252d42febecb6f7063e9f4e211c..3a3fe697925e61c58416c81343b2b9affd0c4cdc 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,153 @@
+2021-04-20  Jonathan Wakely  <jwakely@redhat.com>
+
+	* testsuite/30_threads/semaphore/try_acquire_for.cc: Disable
+	test for targets not using futexes for semaphores.
+	* testsuite/30_threads/semaphore/try_acquire_until.cc: Likewise.
+	* testsuite/30_threads/stop_token/stop_callback/destroy.cc:
+	Disable for all targets.
+
+2021-04-20  Thomas Rodgers  <trodgers@redhat.com>
+
+	* include/Makefile.am: Add new <bits/this_thread_sleep.h> header.
+	* include/Makefile.in: Regenerate.
+	* include/bits/this_thread_sleep.h: New file.
+	* include/bits/atomic_base.h: Adjust all calls
+	to __atomic_wait/__atomic_notify for new call signatures.
+	* include/bits/atomic_timed_wait.h: Extensive rewrite.
+	* include/bits/atomic_wait.h: Likewise.
+	* include/bits/semaphore_base.h: Adjust all calls
+	to __atomic_wait/__atomic_notify for new call signatures.
+	* include/std/atomic: Likewise.
+	* include/std/barrier: Likewise.
+	* include/std/latch: Likewise.
+	* include/std/semaphore: Likewise.
+	* include/std/thread (this_thread::sleep_for)
+	(this_thread::sleep_until): Move to new header.
+	* testsuite/29_atomics/atomic/wait_notify/bool.cc: Simplify
+	test.
+	* testsuite/29_atomics/atomic/wait_notify/generic.cc: Likewise.
+	* testsuite/29_atomics/atomic/wait_notify/pointers.cc: Likewise.
+	* testsuite/29_atomics/atomic_flag/wait_notify/1.cc: Likewise.
+	* testsuite/29_atomics/atomic_float/wait_notify.cc: Likewise.
+	* testsuite/29_atomics/atomic_integral/wait_notify.cc: Likewise.
+	* testsuite/29_atomics/atomic_ref/wait_notify.cc: Likewise.
+
+2021-04-20  Patrick Palka  <ppalka@redhat.com>
+
+	PR libstdc++/95983
+	* include/bits/stl_iterator.h (__detail::__move_iter_cat):
+	Define.
+	(move_iterator): Derive from the above in C++20 in order to
+	conditionally define iterator_category as per P2259.
+	(move_iterator::__base_cat): No longer used, so remove.
+	(move_iterator::iterator_category): Remove in C++20.
+	(__detail::__common_iter_use_postfix_proxy): Define.
+	(common_iterator::_Proxy): Rename to ...
+	(common_iterator:__arrow_proxy): ... this.
+	(common_iterator::__postfix_proxy): Define as per P2259.
+	(common_iterator::operator->): Adjust.
+	(common_iterator::operator++): Adjust as per P2259.
+	(iterator_traits<common_iterator>::_S_iter_cat): Define.
+	(iterator_traits<common_iterator>::iterator_category): Change as
+	per P2259.
+	(__detail::__counted_iter_value_type): Define.
+	(__detail::__counted_iter_concept): Define.
+	(__detail::__counted_iter_cat): Define.
+	(counted_iterator): Derive from the above three classes in order
+	to conditionally define value_type, iterator_concept and
+	iterator category respectively as per P2259.
+	(counted_iterator::operator->): Define as per P2259.
+	(incrementable_traits<counted_iterator>): Remove as per P2259.
+	(iterator_traits<counted_iterator>): Adjust as per P2259.
+	* include/std/ranges (__detail::__iota_view_iter_cat): Define.
+	(iota_view::_Iterator): Derive from the above in order to
+	conditionally define iterator_category as per P2259.
+	(iota_view::_S_iter_cat): Rename to ...
+	(iota_view::_S_iter_concept): ... this.
+	(iota_view::iterator_concept): Use it to apply LWG 3291 changes.
+	(iota_view::iterator_category): Remove.
+	(__detail::__filter_view_iter_cat): Define.
+	(filter_view::_Iterator): Derive from the above in order to
+	conditionally define iterator_category as per P2259.
+	(filter_view::_Iterator): Move to struct __filter_view_iter_cat.
+	(filter_view::_Iterator::iterator_category): Remove.
+	(transform_view::_Base): Define.
+	(transform_view::__iter_cat): Define.
+	(transform_view::_Iterator): Derive from the above in order to
+	conditionally define iterator_category as per P2259.
+	(transform_view::_Iterator::_Base): Just alias
+	transform_view::_Base.
+	(transform_view::_Iterator::_S_iter_cat): Move to struct
+	transform_view::__iter_cat.
+	(transform_view::_Iterator::iterator_category): Remove.
+	(transform_view::_Sentinel::_Base): Just alias
+	transform_view::_Base.
+	(join_view::_Base): Define.
+	(join_view::_Outer_iter): Define.
+	(join_view::_Inner_iter): Define.
+	(join_view::_S_ref_is_glvalue): Define.
+	(join_view::__iter_cat): Define.
+	(join_view::_Iterator): Derive from it in order to conditionally
+	define iterator_category as per P2259.
+	(join_view::_Iterator::_Base): Just alias join_view::_Base.
+	(join_view::_Iterator::_S_ref_is_glvalue): Just alias
+	join_view::_S_ref_is_glvalue.
+	(join_view::_Iterator::_S_iter_cat): Move to struct
+	transform_view::__iter_cat.
+	(join_view::_Iterator::_Outer_iter): Just alias
+	join_view::_Outer_iter.
+	(join_view::_Iterator::_Inner_iter): Just alias
+	join_view::_Inner_iter.
+	(join_view::_Iterator::iterator_category): Remove.
+	(join_view::_Sentinel::_Base): Just alias join_view::_Base.
+	(__detail::__split_view_outer_iter_cat): Define.
+	(__detail::__split_view_inner_iter_cat): Define.
+	(split_view::_Base): Define.
+	(split_view::_Outer_iter): Derive from __split_view_outer_iter_cat
+	in order to conditionally define iterator_category as per P2259.
+	(split_view::_Outer_iter::iterator_category): Remove.
+	(split_view::_Inner_iter): Derive from __split_view_inner_iter_cat
+	in order to conditionally define iterator_category as per P2259.
+	(split_view::_Inner_iter::_S_iter_cat): Move to
+	__split_view_inner_iter_cat.
+	(split_view::_Inner_iter::iterator_category): Remove.
+	(elements_view::_Base): Define.
+	(elements_view::__iter_cat): Define.
+	(elements_view::_Iterator): Derive from the above in order to
+	conditionall define iterator_category as per P2259.
+	(elements_view::_Iterator::_Base): Just alias
+	elements_view::_Base.
+	(elements_view::_Iterator::_S_iter_concept)
+	(elements_view::_Iterator::iterator_concept): Define as per
+	P2259.
+	(elements_view::_Iterator::iterator_category): Remove.
+	(elements_view::_Sentinel::_Base): Just alias
+	elements_view::_Base.
+	* testsuite/24_iterators/headers/iterator/synopsis_c++20.cc:
+	Adjust constraints on iterator_traits<counted_iterator>.
+	* testsuite/std/ranges/p2259.cc: New test.
+
+2021-04-20  Jonathan Wakely  <jwakely@redhat.com>
+
+	PR libstdc++/100146
+	* include/std/charconv (__cpp_lib_to_chars): Define
+	conditionally.
+	* include/std/version (__cpp_lib_to_chars): Likewise..
+	* testsuite/20_util/from_chars/4.cc: Only check feature test
+	macro, not _GLIBCXX_HAVE_USELOCALE.
+	* testsuite/20_util/from_chars/5.cc: Likewise.
+	* testsuite/20_util/from_chars/6.cc: Likewise.
+	* testsuite/20_util/to_chars/long_double.cc: Likewise.
+
+2021-04-20  Jakub Jelinek  <jakub@redhat.com>
+
+	* testsuite/util/testsuite_abi.cc (compare_symbols): If any symbol
+	versions with _IEEE128_ substring are found, set ieee_version_found
+	to true.  Ignore missing symbols with _IEEE128_ in version name if
+	!ieee_version_found.  Use i->first as version_name instead of
+	i->second.version_name if the latter is empty.
+	* config/abi/post/powerpc64-linux-gnu/baseline_symbols.txt: Update.
+
 2021-04-19  H.J. Lu  <hjl.tools@gmail.com>
 
 	* config/abi/post/x86_64-linux-gnu/x32/baseline_symbols.txt:
diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index bbee2aea85703cba7529ba65cb503427cc2cc79d..ab18cfd905d226aa6cd6c7dbf83a4a2bd43f837d 100644
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,8 @@
+2021-04-20  Jakub Jelinek  <jakub@redhat.com>
+
+	* crontab: Snapshots from trunk are now GCC 12 related.
+	Add GCC 11 snapshots from the respective branch.
+
 2021-04-09  Martin Liska  <mliska@suse.cz>
 
 	* branch_changer.py: Generate URL only when emitting