diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index ee7b5b57556871b6f5ae0369708abae56354bd14..39f46c431922e66f46ce453d716c677c0e490c63 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,14 @@
+2021-04-12 Martin Liska <mliska@suse.cz>
+
+ * gcc-changelog/git_commit.py: Do not allow space in long lines.
+
+2021-04-12 Martin Liska <mliska@suse.cz>
+
+ * gcc-changelog/git_commit.py: Support long filenames
+ in entries.
+ * gcc-changelog/test_email.py: Test it.
+ * gcc-changelog/test_patches.txt: Likewise.
+
2021-03-23 Martin Liska <mliska@suse.cz>
* mklog.py: Fix broken tests.
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 56c66b2d1fc4ab076ddfc8e1da687eff7bf62c19..e3d673962d30186b1323644a9c3ca78abf244516 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,66 @@
+2021-04-12 Jakub Jelinek <jakub@redhat.com>
+
+ PR rtl-optimization/99905
+ * combine.c (expand_compound_operation): If pos + len > modewidth,
+ perform the right shift by pos in inner_mode and then convert to mode,
+ instead of trying to simplify a shift of rtx with inner_mode by pos
+ as if it was a shift in mode.
+
+2021-04-12 Jakub Jelinek <jakub@redhat.com>
+
+ PR debug/99830
+ * combine.c (simplify_and_const_int_1): Don't optimize varop
+ away if it has side-effects.
+
+2021-04-12 Martin Liska <mliska@suse.cz>
+
+ * doc/extend.texi: Escape @smallexample content.
+
+2021-04-12 Stefan Schulze Frielinghaus <stefansf@linux.ibm.com>
+
+ * config/s390/s390.md ("*movdi_31", "*movdi_64"): Add
+ alternative in order to load a DFP zero.
+
+2021-04-12 Martin Liska <mliska@suse.cz>
+
+ * doc/extend.texi: Be more precise in documentation
+ of symver attribute.
+
+2021-04-12 Martin Liska <mliska@suse.cz>
+
+ PR sanitizer/99877
+ * gimplify.c (gimplify_expr): Right now, we unpoison all
+ variables before a goto <dest>. We should not do it if we are
+ in a omp context.
+
+2021-04-12 Cui,Lili <lili.cui@intel.com>
+
+ * common/config/i386/cpuinfo.h (get_intel_cpu): Handle
+ rocketlake.
+ * common/config/i386/i386-common.c (processor_names): Add
+ rocketlake.
+ (processor_alias_table): Add rocketlake.
+ * common/config/i386/i386-cpuinfo.h (processor_subtypes): Add
+ INTEL_COREI7_ROCKETLAKE.
+ * config.gcc: Add -march=rocketlake.
+ * config/i386/i386-c.c (ix86_target_macros_internal): Handle
+ rocketlake.
+ * config/i386/i386-options.c (m_ROCKETLAKE) : Define.
+ (processor_cost_table): Add rocketlake cost.
+ * config/i386/i386.h (ix86_size_cost) : Define
+ TARGET_ROCKETLAKE.
+ (processor_type) : Add PROCESSOR_ROCKETLAKE.
+ (PTA_ROCKETLAKE): Ditto.
+ * doc/extend.texi: Add rocketlake.
+ * doc/invoke.texi: Add rocketlake.
+
+2021-04-12 Cui,Lili <lili.cui@intel.com>
+
+ * config/i386/i386.h (PTA_ALDERLAKE): Change alderlake ISA list.
+ * config/i386/i386-options.c (m_CORE_AVX2): Add m_ALDERLAKE.
+ * common/config/i386/cpuinfo.h (get_intel_cpu): Add AlderLake model.
+ * doc/invoke.texi: Change alderlake ISA list.
+
2021-04-11 Hafiz Abid Qadeer <abidh@codesourcery.com>
PR middle-end/98088
diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index d61002305d5f9e50ddae767f0cdfb68a50881c67..177ba027bbe69ee32fcacbf5f2eceb97a7371cae 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20210412
+20210413
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index fcb7c2a6ad9f67d01f4971eb0ef3d7569dcf5b69..208c17ef2d7068a22e07b6ea3174fe07c2ac0442 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2021-04-12 Jason Merrill <jason@redhat.com>
+
+ PR c++/93085
+ * pt.c (uses_outer_template_parms): Handle non-type and template
+ template parameters specifically.
+
2021-04-11 Jason Merrill <jason@redhat.com>
PR c++/97974
diff --git a/gcc/po/ChangeLog b/gcc/po/ChangeLog
index 1ca1876e0538895367a11993b23f2ddf5cd71495..848d446be5a85e72843676dd578015d11e9b8708 100644
--- a/gcc/po/ChangeLog
+++ b/gcc/po/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-12 Joseph Myers <joseph@codesourcery.com>
+
+ * sv.po: Update.
+
2021-04-06 Joseph Myers <joseph@codesourcery.com>
* de.po: Update.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 646e092dfd1c224baf7c66f31429351eb52cef01..9f9a25f3b3b4de4a51d1b1871c1dbd62c50ec167 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,28 @@
+2021-04-12 Jakub Jelinek <jakub@redhat.com>
+
+ PR rtl-optimization/99905
+ * gcc.target/i386/pr99905.c: New test.
+
+2021-04-12 Jakub Jelinek <jakub@redhat.com>
+
+ PR debug/99830
+ * gcc.dg/pr99830.c: New test.
+
+2021-04-12 Jason Merrill <jason@redhat.com>
+
+ PR c++/93085
+ * g++.dg/template/dependent-tmpl1.C: New test.
+
+2021-04-12 Martin Liska <mliska@suse.cz>
+
+ PR sanitizer/99877
+ * g++.dg/asan/pr99877.C: New test.
+
+2021-04-12 Cui,Lili <lili.cui@intel.com>
+
+ * gcc.target/i386/funcspec-56.inc: Handle new march.
+ * g++.target/i386/mv16.C: Handle new march
+
2021-04-11 Hafiz Abid Qadeer <abidh@codesourcery.com>
PR middle-end/98088
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7b19ca525ed495603eb74fd145a4efe89d64edab..82af666ea0018aea63df279f9ae17e9be778f758 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,26 @@
+2021-04-12 Jonathan Wakely <jwakely@redhat.com>
+
+ PR libstdc++/100044
+ * include/bits/ranges_util.h (__detail::__iterator_sentinel_pair):
+ Remove helper concept.
+ (subrange(_Pr), subrange(Pr, __make_unsigned_like<...>)): Remove
+ deduction guides, as per LWG 3404.
+ * testsuite/std/ranges/subrange/lwg3282_neg.cc: Check that class
+ template argument deduction fails.
+
+2021-04-12 Jonathan Wakely <jwakely@redhat.com>
+
+ * testsuite/26_numerics/random/linear_congruential_engine/requirements/non_uint_neg.cc:
+ Adjust expected error for C++20 mode.
+ * testsuite/tr1/5_numerical_facilities/random/linear_congruential/requirements/non_uint_neg.cc:
+ Likewise.
+
+2021-04-12 Jonathan Wakely <jwakely@redhat.com>
+
+ PR libstdc++/99995
+ * testsuite/17_intro/headers/c++1998/49745.cc: Include all
+ standard headers and XFAIL for effective-target c++20.
+
2021-04-09 François Dumont <fdumont@gcc.gnu.org>
PR libstdc++/99402