diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3fa27b93de9694178d930ae6a42374b5ba1a9eca..f975147d3844cfaf007e00cfdfb3b76efbdff411 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,96 @@
+2023-08-24  Tobias Burnus  <tobias@codesourcery.com>
+
+	Backported from master:
+	2023-08-19  Tobias Burnus  <tobias@codesourcery.com>
+
+	PR middle-end/111017
+	* omp-expand.cc (expand_omp_for_init_vars): Pass after=true
+	to expand_omp_build_cond for 'factor != 0' condition, resulting
+	in pre-r12-5295-g47de0b56ee455e code for the gimple insert.
+
+2023-08-24  Richard Biener  <rguenther@suse.de>
+
+	Backported from master:
+	2023-08-21  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/111070
+	* tree-ssa-ifcombine.cc (ifcombine_ifandif): Check we have
+	an SSA name before checking SSA_NAME_OCCURS_IN_ABNORMAL_PHI.
+
+2023-08-24  Richard Biener  <rguenther@suse.de>
+
+	Backported from master:
+	2023-08-17  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/111039
+	* tree-ssa-ifcombine.cc (ifcombine_ifandif): Check for
+	SSA_NAME_OCCURS_IN_ABNORMAL_PHI.
+
+2023-08-24  Richard Biener  <rguenther@suse.de>
+
+	Backported from master:
+	2023-08-18  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/111019
+	* tree-ssa-loop-im.cc (gather_mem_refs_stmt): When canonicalizing
+	also scrap base and offset in case the ref is indirect.
+
+2023-08-24  Richard Biener  <rguenther@suse.de>
+
+	Backported from master:
+	2023-08-03  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/110702
+	* tree-ssa-loop-ivopts.cc (rewrite_use_address): When
+	we created a NULL pointer based access rewrite that to
+	a LEA.
+
+2023-08-24  Andrew Pinski  <apinski@marvell.com>
+
+	Backported from master:
+	2023-08-24  Andrew Pinski  <apinski@marvell.com>
+
+	PR tree-optimization/111109
+	* match.pd (ior(cond,cond), ior(vec_cond,vec_cond)):
+	Add check to make sure cmp and icmp are inverse.
+
+2023-08-24  Richard Biener  <rguenther@suse.de>
+
+	Backported from master:
+	2023-08-24  Richard Biener  <rguenther@suse.de>
+
+	PR debug/111080
+	* dwarf2out.cc (prune_unused_types_walk): Handle
+	DW_TAG_restrict_type, DW_TAG_shared_type, DW_TAG_atomic_type,
+	DW_TAG_immutable_type, DW_TAG_coarray_type, DW_TAG_unspecified_type
+	and DW_TAG_dynamic_type as to only output them when referenced.
+
+2023-08-24  liuhongt  <hongtao.liu@intel.com>
+
+	Backported from master:
+	2023-08-24  liuhongt  <hongtao.liu@intel.com>
+
+	* common/config/i386/i386-common.cc (processor_names): Add new
+	member graniterapids-s.
+	* config/i386/i386-options.cc (processor_alias_table): Update
+	PROCESSOR_GRANITERAPIDS_D.
+	(m_GRANITERAPID_D): New macro.
+	(m_CORE_AVX512): Add m_GRANITERAPIDS_D.
+	(processor_cost_table): Add icelake_cost for
+	PROCESSOR_GRANITERAPIDS_D.
+	* config/i386/i386.h (enum processor_type): Add new member
+	PROCESSOR_GRANITERAPIDS_D.
+	* config/i386/i386-c.cc (ix86_target_macros_internal): Handle
+	PROCESSOR_GRANITERAPIDS_D.
+
+2023-08-24  liuhongt  <hongtao.liu@intel.com>
+
+	Backported from master:
+	2023-08-24  liuhongt  <hongtao.liu@intel.com>
+
+	* config/i386/i386.cc (ix86_invalid_conversion): Adjust GCC
+	V13 to GCC 13.1.
+
 2023-08-23  Uros Bizjak  <ubizjak@gmail.com>
 
 	PR target/111010
diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index d736aa1f38ab24234f72e6aea22f709a38176647..ff7cfb5348d0f94ba1be2e18a719cfe3c22136e9 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20230824
+20230825
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fcf69e46896c50011e2b9f3a4a205ebe380f02e6..a0bcb2c4d6548296914cd6b3d993cfab77b0290b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,51 @@
+2023-08-24  Richard Biener  <rguenther@suse.de>
+
+	Backported from master:
+	2023-08-21  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/111070
+	* gcc.dg/pr111070.c: New testcase.
+
+2023-08-24  Richard Biener  <rguenther@suse.de>
+
+	Backported from master:
+	2023-08-17  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/111039
+	* gcc.dg/pr111039.c: New testcase.
+
+2023-08-24  Richard Biener  <rguenther@suse.de>
+
+	Backported from master:
+	2023-08-18  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/111019
+	* g++.dg/torture/pr111019.C: New testcase.
+
+2023-08-24  Richard Biener  <rguenther@suse.de>
+
+	Backported from master:
+	2023-08-03  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/110702
+	* gcc.dg/torture/pr110702.c: New testcase.
+
+2023-08-24  Andrew Pinski  <apinski@marvell.com>
+
+	Backported from master:
+	2023-08-24  Andrew Pinski  <apinski@marvell.com>
+
+	PR tree-optimization/111109
+	* gcc.c-torture/execute/ieee/fp-cmp-cond-1.c: New test.
+
+2023-08-24  Richard Biener  <rguenther@suse.de>
+
+	Backported from master:
+	2023-08-24  Richard Biener  <rguenther@suse.de>
+
+	PR debug/111080
+	* gcc.dg/debug/dwarf2/pr111080.c: New testcase.
+
 2023-08-16  Patrick Palka  <ppalka@redhat.com>
 
 	Backported from master:
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index ffd1a090ce1382a234eb6c8e8c960cdef36b56ed..f86157edc7ec181c8d522e9b6a77e124647f33f3 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,11 @@
+2023-08-24  Tobias Burnus  <tobias@codesourcery.com>
+
+	Backported from master:
+	2023-08-19  Tobias Burnus  <tobias@codesourcery.com>
+
+	PR middle-end/111017
+	* testsuite/libgomp.c-c++-common/non-rect-loop-1.c: New test.
+
 2023-07-27  Release Manager
 
 	* GCC 13.2.0 released.