diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f0fd22fad37f1581e3c0be704d3389186ceb39c6..50cdb4032c94f531d68c0c318a6912503e494744 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2023-04-02  Juzhe-Zhong  <juzhe.zhong@rivai.ai>
+	    kito-cheng  <kito.cheng@sifive.com>
+
+	* config/riscv/vector.md: Fix RA constraint.
+
+2023-04-02  Juzhe-Zhong  <juzhe.zhong@rivai.ai>
+
+	* config/riscv/riscv-protos.h (gen_avl_for_scalar_move): New function.
+	* config/riscv/riscv-v.cc (gen_avl_for_scalar_move): New function.
+	* config/riscv/vector.md: Fix scalar move bug.
+
 2023-04-01  Jakub Jelinek  <jakub@redhat.com>
 
 	* range-op-float.cc (foperator_equal::fold_range): If at least
diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index afd3f9fc6c889765b6498164348a11d4d58c5eae..a77ceb4df4ddd4b1a79ed24c34eadf3627b1d535 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20230402
+20230403
diff --git a/gcc/m2/ChangeLog b/gcc/m2/ChangeLog
index 9e02313203e44b0b537e87a50e20d5e4c10f6a13..9e7d43db3362f225d17850c246bf51aadb11d3ae 100644
--- a/gcc/m2/ChangeLog
+++ b/gcc/m2/ChangeLog
@@ -1,3 +1,22 @@
+2023-04-02  Gaius Mulley  <gaiusmod2@gmail.com>
+
+	PR modula2/109336
+	* Make-lang.in (GM2_O): Set to -O0.
+	(GM2_LIBS): Remove target libraries and replace with build libs.
+	(BUILD-LIBS): New declaration.
+	(m2/gm2-libs/libgm2.a): New rule.
+	(m2/gm2-libs/%.o): New rule.
+	(m2/gm2-libs/choosetemp.o): New rule.
+	* gm2-compiler/M2ColorString.mod (append): Use ADR rather than
+	implicit conversion.
+	* gm2-compiler/M2Comp.mod (Compile): Add qprintf messages for when
+	a source file is not found.  Improve comments and formatting.
+	* gm2-libs-ch/cgetopt.c (cgetopt_cgetopt_long): Remove
+	ansi-decl.h.  Add getopt.h.
+	(cgetopt_cgetopt_long_only): Change cgetopt_ to getopt_.
+	* gm2spec.cc (lang_specific_driver): Do not skip -fmod=.
+	Remove comment.
+
 2023-03-29  Gaius Mulley  <gaiusmod2@gmail.com>
 
 	PR modula2/109336
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6b79db9c9604aefdd413bf89e1947769cb9d8cce..8f5d5308cb9894c6893851b5fb36f90a546b5314 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,26 @@
+2023-04-02  John David Anglin  <danglin@gcc.gnu.org>
+
+	PR target/109375
+	* gnat.dg/opt39.adb: Add hppa*-*-* to dg-additional-options list.
+
+2023-04-02  John David Anglin  <danglin@gcc.gnu.org>
+
+	PR target/109376
+	* gnat.dg/prot7.adb: Skip on hppa.
+
+2023-04-02  Juzhe-Zhong  <juzhe.zhong@rivai.ai>
+	    kito-cheng  <kito.cheng@sifive.com>
+
+	* g++.target/riscv/rvv/base/bug-19.C: New test.
+	* g++.target/riscv/rvv/base/bug-20.C: New test.
+	* g++.target/riscv/rvv/base/bug-21.C: New test.
+	* g++.target/riscv/rvv/base/bug-22.C: New test.
+
+2023-04-02  Juzhe-Zhong  <juzhe.zhong@rivai.ai>
+
+	* gcc.target/riscv/rvv/base/scalar_move-6.c: Adapt test.
+	* gcc.target/riscv/rvv/base/scalar_move-9.c: New test.
+
 2023-04-01  Patrick Palka  <ppalka@redhat.com>
 
 	PR c++/109160
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index be8bc5d439b54968362dec0de91d6a158fe90d4d..99e5a861fbede9ecddc99b7f2ffca03172d13a81 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2023-04-02  Jakub Jelinek  <jakub@redhat.com>
+
+	PR other/109306
+	* strstr.c: Revert the 2020-11-13 changes.
+	(strstr): Return s1 if len is 0.
+
 2023-03-30  Gerald Pfeifer  <gerald@pfeifer.com>
 
 	* obstacks.texi (Preparing for Obstacks): Remove a (broken)