diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8a8a719df09e4f7aa0e00f6e77a7e4f94a623f90..3128ba3da4310e5707fb492780350c0e31509b14 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2023-05-17  Jakub Jelinek  <jakub@redhat.com>
+
+	Backported from master:
+	2023-05-17  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/109884
+	* config/i386/i386-builtin-types.def (FLOAT128): Use
+	float128t_type_node rather than float128_type_node.
+
 2023-05-16  Patrick O'Neill  <patrick@rivosinc.com>
 
 	PR target/104338
diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index e2f60e4d429e0d10660378c9886f3614065c36c1..460c1ea9af3ebd915a258d81f01ed94043da67e0 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20230517
+20230518
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e2d8ea211d0e69913cfff6102d11842654ce3045..7bcd7a9855e578f4ccf1ff1daa4f3a9cd8854bcf 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,12 @@
+2023-05-17  Jakub Jelinek  <jakub@redhat.com>
+
+	Backported from master:
+	2023-05-17  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/109868
+	* init.cc (build_zero_init_1): Don't initialize zero-width bitfields.
+	For unions only initialize the first FIELD_DECL.
+
 2023-05-16  Marek Polacek  <polacek@redhat.com>
 
 	Backported from master:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 28c30980d337e2ddcb2a481d3ace6c4e7438bfa6..231d739c8dc536f8f6178338f591e2210df35a40 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,19 @@
+2023-05-17  Jakub Jelinek  <jakub@redhat.com>
+
+	Backported from master:
+	2023-05-17  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/109884
+	* c-c++-common/pr109884.c: New test.
+
+2023-05-17  Jakub Jelinek  <jakub@redhat.com>
+
+	Backported from master:
+	2023-05-17  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/109868
+	* g++.dg/init/pr109868.C: New test.
+
 2023-05-16  Marek Polacek  <polacek@redhat.com>
 
 	Backported from master:
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index d38b88c5d4131eaab27e1cecce1b9c147be573a4..8face8a4dcc72d68e4776760ac270be2c39fda70 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,25 @@
+2023-05-17  Jakub Jelinek  <jakub@redhat.com>
+
+	Backported from master:
+	2023-05-17  Jakub Jelinek  <jakub@redhat.com>
+
+	PR libstdc++/109883
+	* testsuite/26_numerics/headers/cmath/constexpr_std_c++23.cc: New test.
+
+2023-05-17  Jakub Jelinek  <jakub@redhat.com>
+
+	Backported from master:
+	2023-05-17  Jakub Jelinek  <jakub@redhat.com>
+
+	PR libstdc++/109883
+	* include/c_global/cmath (atan2, fmod, pow): Move
+	__gnu_cxx::__promote_2 using templates after _Float{16,32,64,128} and
+	__gnu_cxx::__bfloat16_t overloads.
+	(copysign, fdim, fmax, fmin, hypot, nextafter, remainder, remquo):
+	Likewise.
+	(fma): Move __gnu_cxx::__promote_3 using template after
+	_Float{16,32,64,128} and __gnu_cxx::__bfloat16_t overloads.
+
 2023-05-11  Jonathan Wakely  <jwakely@redhat.com>
 
 	Backported from master: