diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ef93c56fe21..472af78e7eb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,44 @@
+2021-03-17  Sandra Loosemore  <sandra@codesourcery.com>
+
+	* config/nios2/nios2.c (nios2_custom_check_insns): Clean up
+	error message format issues.
+	(nios2_option_override): Likewise.
+	(nios2_expand_fpu_builtin): Likewise.
+	(nios2_init_custom_builtins): Adjust to avoid bogus strncpy
+	truncation warning.
+	(nios2_expand_custom_builtin): More error message format fixes.
+	(nios2_expand_rdwrctl_builtin): Likewise.
+	(nios2_expand_rdprs_builtin): Likewise.
+	(nios2_expand_eni_builtin): Likewise.
+	(nios2_expand_builtin): Likewise.
+	(nios2_register_custom_code): Likewise.
+	(nios2_valid_target_attribute_rec): Likewise.
+	(nios2_add_insn_asm): Fix uninitialized variable warning.
+
+2021-03-17  Jan Hubicka  <jh@suse.cz>
+
+	* config/i386/x86-tune-costs.h (struct processor_costs): Update costs
+	of gather to match reality.
+	* config/i386/x86-tune.def (X86_TUNE_USE_GATHER): Enable for znver3.
+
+2021-03-17  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+	* config/aarch64/aarch64-builtins.c (aarch64_expand_rng_builtin): Use EQ
+	to compare against CC_REG rather than NE.
+
+2021-03-17  H.J. Lu  <hjl.tools@gmail.com>
+
+	PR target/99504
+	* config/i386/i386.c (ix86_force_load_from_GOT_p): Support
+	inline assembly statements.
+	(ix86_print_operand): Update 'P' handling for -fno-plt.
+
+2021-03-17  Tamar Christina  <tamar.christina@arm.com>
+
+	PR target/99542
+	* config/aarch64/aarch64.c
+	(aarch64_simd_clone_compute_vecsize_and_simdlen): Remove unused var.
+
 2021-03-16  Segher Boessenkool  <segher@kernel.crashing.org>
 
 	PR target/98092
diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index 609f807edec..5a5e7e1b211 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20210317
+20210318
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0f914146d1e..f2f7f45712d 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,18 @@
+2021-03-17  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/97973
+	* call.c (conv_unsafe_in_template_p): New.
+	(convert_like): Use it.
+
+2021-03-17  Anthony Sharp  <anthonysharp15@gmail.com>
+	    Jason Merrill  <jason@redhat.com>
+
+	* semantics.c (get_class_access_diagnostic_decl): New
+	function that examines special cases when a parent
+	class causes a private access failure.
+	(enforce_access): Slightly modified to call function
+	above.
+
 2021-03-16  Jason Merrill  <jason@redhat.com>
 
 	* tree.c (cp_tree_equal): Use real_identical.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5e6b5368ac7..55b41de8092 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,39 @@
+2021-03-17  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/97973
+	* g++.dg/conversion/real-to-int1.C: New test.
+
+2021-03-17  Anthony Sharp  <anthonysharp15@gmail.com>
+	    Jason Merrill  <jason@redhat.com>
+
+	* g++.dg/cpp1z/using9.C: New using decl test.
+
+2021-03-17  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* c-c++-common/asan/strncpy-overflow-1.c: Add _FORTIFY_SOURCE=0 and
+	-gdwarf-3 to the command line options. Adjust the expected line
+	numbers for the revised options header.
+
+2021-03-17  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* c-c++-common/asan/memcmp-1.c: Add _FORTIFY_SOURCE=0 and
+	-gdwarf-3 to the command line options.  Provide Darwin-
+	specific match lines for the expected output.
+
+2021-03-17  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+	* gcc.target/aarch64/acle/rng_2.c: New test.
+
+2021-03-17  H.J. Lu  <hjl.tools@gmail.com>
+
+	PR target/99504
+	* gcc.target/i386/pr99530-1.c: New test.
+	* gcc.target/i386/pr99530-2.c: Likewise.
+	* gcc.target/i386/pr99530-3.c: Likewise.
+	* gcc.target/i386/pr99530-4.c: Likewise.
+	* gcc.target/i386/pr99530-5.c: Likewise.
+	* gcc.target/i386/pr99530-6.c: Likewise.
+
 2021-03-16  Christophe Lyon  <christophe.lyon@linaro.org>
 
 	PR target/99542