diff -Nrcpad gcc-13-20260826/LAST_UPDATED gcc-13-20260902/LAST_UPDATED
*** gcc-13-20260826/LAST_UPDATED	Wed Aug 26 22:32:23 2026
--- gcc-13-20260902/LAST_UPDATED	Wed Sep  2 22:32:20 2026
***************
*** 1 ****
! Obtained from git: releases/gcc-13 revision 8b46cd7c5f3c839d0f6505832afdc14958772ce4
--- 1 ----
! Obtained from git: releases/gcc-13 revision 6b309790cfe6f6ef2f9f9f70eaad3637866f7c3e
diff -Nrcpad gcc-13-20260826/MD5SUMS gcc-13-20260902/MD5SUMS
*** gcc-13-20260826/MD5SUMS	Wed Aug 26 22:32:27 2026
--- gcc-13-20260902/MD5SUMS	Wed Sep  2 22:32:24 2026
***************
*** 1,5 ****
  # This file contains the MD5 checksums of the files in the
! # gcc-13-20260826.tar.xz tarball.
  #
  # Besides verifying that all files in the tarball were correctly expanded,
  # it also can be used to determine if any files have changed since the
--- 1,5 ----
  # This file contains the MD5 checksums of the files in the
! # gcc-13-20260902.tar.xz tarball.
  #
  # Besides verifying that all files in the tarball were correctly expanded,
  # it also can be used to determine if any files have changed since the
*************** d32239bcb673463ab874e80d47fae504  COPYIN
*** 21,27 ****
  fd4ecdf5d672efe2b0e409aca9cf9446  ChangeLog.jit
  09538b708302f1735f6fa05b622ecf5e  ChangeLog.tree-ssa
  24ab760126489e69436a43185dc3d202  INSTALL/README
! 0b7713e35a83f46470922d35ae870632  LAST_UPDATED
  81b3330d422f3ce1ef8b720dfae35068  MAINTAINERS
  2b61ddbd876fa839639a7ca551773426  Makefile.def
  5d2d6a74f897f8158d37f5f2ec6877ce  Makefile.in
--- 21,27 ----
  fd4ecdf5d672efe2b0e409aca9cf9446  ChangeLog.jit
  09538b708302f1735f6fa05b622ecf5e  ChangeLog.tree-ssa
  24ab760126489e69436a43185dc3d202  INSTALL/README
! 0891f038020abb90d508ea287c57197f  LAST_UPDATED
  81b3330d422f3ce1ef8b720dfae35068  MAINTAINERS
  2b61ddbd876fa839639a7ca551773426  Makefile.def
  5d2d6a74f897f8158d37f5f2ec6877ce  Makefile.in
*************** a22e70b3f29292d0e628450f4bb11e62  fixinc
*** 475,481 ****
  a916467b91076e631dd8edb7424769c7  gcc/COPYING.LIB
  d32239bcb673463ab874e80d47fae504  gcc/COPYING3
  6a6a8e020838b23406c81b19c1d46df6  gcc/COPYING3.LIB
! 5171ebfd0935d40dd82faea10ebd6f30  gcc/ChangeLog
  a3b63c675afa7a655cc2bfa8a907af79  gcc/ChangeLog-1997
  d9a88529352a010253c2e8fb1ed6023b  gcc/ChangeLog-1998
  240f08f81cb4699e8b49347db38233db  gcc/ChangeLog-1999
--- 475,481 ----
  a916467b91076e631dd8edb7424769c7  gcc/COPYING.LIB
  d32239bcb673463ab874e80d47fae504  gcc/COPYING3
  6a6a8e020838b23406c81b19c1d46df6  gcc/COPYING3.LIB
! 7479be669562b755087aa922b8808e8f  gcc/ChangeLog
  a3b63c675afa7a655cc2bfa8a907af79  gcc/ChangeLog-1997
  d9a88529352a010253c2e8fb1ed6023b  gcc/ChangeLog-1998
  240f08f81cb4699e8b49347db38233db  gcc/ChangeLog-1999
*************** fb3fadb88e1d2b3b640cfaaa5ff11780  gcc/Ch
*** 510,516 ****
  3eb07e0b2e542409bf73d359f7f65609  gcc/ChangeLog.ptr
  e13638e26743ba41e6011b76cc00d9a9  gcc/ChangeLog.tree-ssa
  739ab47f6425bcea1d05e4fc0542de54  gcc/ChangeLog.tuples
! d7d523b4fbf020ead0e7e3e589bfb6cd  gcc/DATESTAMP
  d41d8cd98f00b204e9800998ecf8427e  gcc/DEV-PHASE
  eb92e1ff5e982ca07e173e0eb286d243  gcc/FSFChangeLog
  30e1e33411566388b3164558482dc5e6  gcc/FSFChangeLog.10
--- 510,516 ----
  3eb07e0b2e542409bf73d359f7f65609  gcc/ChangeLog.ptr
  e13638e26743ba41e6011b76cc00d9a9  gcc/ChangeLog.tree-ssa
  739ab47f6425bcea1d05e4fc0542de54  gcc/ChangeLog.tuples
! 60656019cf2f26c36ce129d51fa5fb4f  gcc/DATESTAMP
  d41d8cd98f00b204e9800998ecf8427e  gcc/DEV-PHASE
  eb92e1ff5e982ca07e173e0eb286d243  gcc/FSFChangeLog
  30e1e33411566388b3164558482dc5e6  gcc/FSFChangeLog.10
*************** c3ab3d8980033cd869c1c27b318115ce  gcc/co
*** 3542,3549 ****
  0e3f58ff86af5534419a0e0fb1a552a1  gcc/config/avr/avr-protos.h
  55c51229f13ced0bdddbfd397c9a57d4  gcc/config/avr/avr-stdint.h
  f5c2f17f7344ec1d55919512ee02ac4e  gcc/config/avr/avr.cc
! 800f7501f0eacfee1c1b717e491085b2  gcc/config/avr/avr.h
! 43fee9a758fe7d37f8c47f01e9eb6fad  gcc/config/avr/avr.md
  154dcf10de2f21666b4516257fbcecd2  gcc/config/avr/avr.opt
  d5ca1928fb0eef4a39e419faa25782b4  gcc/config/avr/avrlibc.h
  82e55abb13cdee932b88cb4c074f76fe  gcc/config/avr/builtins.def
--- 3542,3549 ----
  0e3f58ff86af5534419a0e0fb1a552a1  gcc/config/avr/avr-protos.h
  55c51229f13ced0bdddbfd397c9a57d4  gcc/config/avr/avr-stdint.h
  f5c2f17f7344ec1d55919512ee02ac4e  gcc/config/avr/avr.cc
! 04b344cc6e8130b10c0d465be571bce6  gcc/config/avr/avr.h
! 35250616ce3da36c62ec7beb6dc3f78b  gcc/config/avr/avr.md
  154dcf10de2f21666b4516257fbcecd2  gcc/config/avr/avr.opt
  d5ca1928fb0eef4a39e419faa25782b4  gcc/config/avr/avrlibc.h
  82e55abb13cdee932b88cb4c074f76fe  gcc/config/avr/builtins.def
*************** e2a5b46a69472ea8c1b02e68518c0831  gcc/co
*** 4276,4289 ****
  ac7b52c7fc21bb9196eee41f2f0dc65a  gcc/config/mips/mips-dsp.md
  d7c7d648633e3751538d001af47d7dc0  gcc/config/mips/mips-dspr2.md
  c2cfe00ae73a68f07ce649b980612c9c  gcc/config/mips/mips-fixed.md
! c08e4bab6c1e75a72083a45020a5b446  gcc/config/mips/mips-ftypes.def
  78532a885490fb3a90b0c4a85437f2e1  gcc/config/mips/mips-modes.def
  fbe407e03794a9ee607663ce7de6eadb  gcc/config/mips/mips-msa.md
  30376b626fc9050218641fcde797c92f  gcc/config/mips/mips-opts.h
  b6ef595c9b75af5e5679a8799c944443  gcc/config/mips/mips-protos.h
  32ba594f8a210398a1e585dfcc8b1d8d  gcc/config/mips/mips-ps-3d.md
  e0f0f7f5cd3f66adff43ada64fd352e1  gcc/config/mips/mips-tables.opt
! 36265b8f606076aae7dc7221733043d1  gcc/config/mips/mips.cc
  9e3bffdb2b33a326178eddd2138674d0  gcc/config/mips/mips.h
  fd1a1985d2fa9e92b6867215ad4b9127  gcc/config/mips/mips.md
  3b233a9733cc91ecbf6950b871004528  gcc/config/mips/mips.opt
--- 4276,4289 ----
  ac7b52c7fc21bb9196eee41f2f0dc65a  gcc/config/mips/mips-dsp.md
  d7c7d648633e3751538d001af47d7dc0  gcc/config/mips/mips-dspr2.md
  c2cfe00ae73a68f07ce649b980612c9c  gcc/config/mips/mips-fixed.md
! 42a377d9bf35d532317346ab82352a7c  gcc/config/mips/mips-ftypes.def
  78532a885490fb3a90b0c4a85437f2e1  gcc/config/mips/mips-modes.def
  fbe407e03794a9ee607663ce7de6eadb  gcc/config/mips/mips-msa.md
  30376b626fc9050218641fcde797c92f  gcc/config/mips/mips-opts.h
  b6ef595c9b75af5e5679a8799c944443  gcc/config/mips/mips-protos.h
  32ba594f8a210398a1e585dfcc8b1d8d  gcc/config/mips/mips-ps-3d.md
  e0f0f7f5cd3f66adff43ada64fd352e1  gcc/config/mips/mips-tables.opt
! 5f7a010c33a78d3b3266a09a5bc96512  gcc/config/mips/mips.cc
  9e3bffdb2b33a326178eddd2138674d0  gcc/config/mips/mips.h
  fd1a1985d2fa9e92b6867215ad4b9127  gcc/config/mips/mips.md
  3b233a9733cc91ecbf6950b871004528  gcc/config/mips/mips.opt
*************** b829ed0032c899e107be2db349c913f3  gcc/ta
*** 7637,7643 ****
  811da275a2b9d3186a6decf96c01b0ed  gcc/targhooks.cc
  edb193a32070c4a7626fb75382def9b9  gcc/targhooks.h
  f39fcaa8197187283ccfed40107b426d  gcc/testsuite/.gitattributes
! f9729934cf2f986356ff69b300080f01  gcc/testsuite/ChangeLog
  862f04afbd87da2cc6bc432c3f28430f  gcc/testsuite/ChangeLog-1993-2007
  029a5d8dacd25eb5d4711452ac448e5b  gcc/testsuite/ChangeLog-2008
  13ac28c41d51b66b4ec40dba6bd50f39  gcc/testsuite/ChangeLog-2009
--- 7637,7643 ----
  811da275a2b9d3186a6decf96c01b0ed  gcc/targhooks.cc
  edb193a32070c4a7626fb75382def9b9  gcc/targhooks.h
  f39fcaa8197187283ccfed40107b426d  gcc/testsuite/.gitattributes
! 295f67e282d7efe19998b9a4027fabb4  gcc/testsuite/ChangeLog
  862f04afbd87da2cc6bc432c3f28430f  gcc/testsuite/ChangeLog-1993-2007
  029a5d8dacd25eb5d4711452ac448e5b  gcc/testsuite/ChangeLog-2008
  13ac28c41d51b66b4ec40dba6bd50f39  gcc/testsuite/ChangeLog-2009
*************** f2e2a6171e51d284aef6b4356f338ad3  gcc/te
*** 10909,10914 ****
--- 10909,10915 ----
  027fa50fd78720edd2f51bb22c3bd84f  gcc/testsuite/c-c++-common/cpp/ucnid-2011-1-utf8.c
  3a1169881f0152504462d4376c3b8083  gcc/testsuite/c-c++-common/cpp/ucnid-2011-1.c
  83bc077362cc4ef37199360c8b7fe130  gcc/testsuite/c-c++-common/cpp/va-opt-10.c
+ c0cee8d2b608a65564c4f25246c1a566  gcc/testsuite/c-c++-common/cpp/va-opt-11.c
  0f93514d0ad79c03edfd672fb354e619  gcc/testsuite/c-c++-common/cpp/va-opt-2.c
  adb3860eef253c75b743827724ba1bbc  gcc/testsuite/c-c++-common/cpp/va-opt-3.c
  ffa7f1250b7f00a641ad13c5836e4f01  gcc/testsuite/c-c++-common/cpp/va-opt-4.c
*************** daf40cbe22c01f26a5655b3c8ce6f5a7  gcc/te
*** 33145,33150 ****
--- 33146,33152 ----
  0326a0afb833c5dbd49b5d623c8dd93b  gcc/testsuite/g++.target/mips/cxx17_empty_base.C
  57a6c9f80be13720acfbbdbeef414716  gcc/testsuite/g++.target/mips/mips.exp
  dcd3af289f36f150df28be99b5efc7ed  gcc/testsuite/g++.target/mips/pr102024.C
+ db65053e8b783b1724e9fc6d06e3794c  gcc/testsuite/g++.target/mips/pr126484.C
  436543179ef45c1a7c596bfa70c8ef1d  gcc/testsuite/g++.target/msp430/data-attributes.C
  a7c5e3a5228d3ef0c41fbf94725ca379  gcc/testsuite/g++.target/msp430/msp430.exp
  5848d6741a53192ff50fe53e91b24df1  gcc/testsuite/g++.target/nios2/hello-pie.C
*************** f402be89e4891c76c691c8144fe168f7  gcc/te
*** 44655,44661 ****
  c24af1592de8918050b279c29b0300ce  gcc/testsuite/gcc.dg/pr125173-1.c
  bc5ddfbbc46f4e0cce1629d1b58d3090  gcc/testsuite/gcc.dg/pr12603.c
  72a2fca76cb69617ae36bab93c7ec0d7  gcc/testsuite/gcc.dg/pr12625-1.c
! f3ad76ba5080e5c627e1d54c8e3fc967  gcc/testsuite/gcc.dg/pr126464.c
  6f0ef61e5a12db5f11da839b2988c5e1  gcc/testsuite/gcc.dg/pr13519-1.c
  86dc5cfaafafc79e11d0559d71baea6b  gcc/testsuite/gcc.dg/pr13804-1.c
  2a52cc05fb1415e0eafbc468a7ccc138  gcc/testsuite/gcc.dg/pr14092-1.c
--- 44657,44663 ----
  c24af1592de8918050b279c29b0300ce  gcc/testsuite/gcc.dg/pr125173-1.c
  bc5ddfbbc46f4e0cce1629d1b58d3090  gcc/testsuite/gcc.dg/pr12603.c
  72a2fca76cb69617ae36bab93c7ec0d7  gcc/testsuite/gcc.dg/pr12625-1.c
! fdb2036892a5d4d268eb67a8a000644c  gcc/testsuite/gcc.dg/pr126464.c
  6f0ef61e5a12db5f11da839b2988c5e1  gcc/testsuite/gcc.dg/pr13519-1.c
  86dc5cfaafafc79e11d0559d71baea6b  gcc/testsuite/gcc.dg/pr13804-1.c
  2a52cc05fb1415e0eafbc468a7ccc138  gcc/testsuite/gcc.dg/pr14092-1.c
*************** d4f9bc1a728b13f9940b71ab03cc40fd  gcc/te
*** 47925,47930 ****
--- 47927,47935 ----
  fbe779467ae6f7cb7ee578922f1e8686  gcc/testsuite/gcc.dg/torture/pr125025.c
  34d76b7c3d511915334d6295155dc103  gcc/testsuite/gcc.dg/torture/pr125774-1.c
  41ed1d0a724d4e7e08239b14b14a1043  gcc/testsuite/gcc.dg/torture/pr126464.c
+ e6132b99fe49e5ef626b8a5c49e9670a  gcc/testsuite/gcc.dg/torture/pr126547.c
+ dd52fd0f3c0ee9acc92c2956c8695df5  gcc/testsuite/gcc.dg/torture/pr126564.c
+ f80e9f48f86c757f3f37f34e4c8e4f8c  gcc/testsuite/gcc.dg/torture/pr126576.c
  ded4330fd1cd52783bd9b1761db038ef  gcc/testsuite/gcc.dg/torture/pr16104-1.c
  fc265ee05da2f29f0e92804661cd1f28  gcc/testsuite/gcc.dg/torture/pr17526.c
  01c583edb41b632b835aa892b9c1cb14  gcc/testsuite/gcc.dg/torture/pr17933-1.c
*************** c6848ef9d4a9873e77016b18db0eef64  gcc/te
*** 49998,50003 ****
--- 50003,50009 ----
  b0891b1dddf226da47f4f976abdd7cb0  gcc/testsuite/gcc.dg/tree-ssa/pr119085.c
  71eb14b3ae5faf81c5226dc766d48edd  gcc/testsuite/gcc.dg/tree-ssa/pr122976.c
  d87a1ad6187c06f07e6ee3b7c6352e9e  gcc/testsuite/gcc.dg/tree-ssa/pr124151.c
+ 48b9927c83dc18a6b5d592a592dad513  gcc/testsuite/gcc.dg/tree-ssa/pr126601.c
  78e6c5fe63f7305009c8a79840fe20dc  gcc/testsuite/gcc.dg/tree-ssa/pr13146.c
  eab19e0c04884cd782c9879cbe292109  gcc/testsuite/gcc.dg/tree-ssa/pr14341.c
  9945ed7002a5f7d4918e8ff5eb4cb647  gcc/testsuite/gcc.dg/tree-ssa/pr14490-1.c
*************** ebbf958a9ec613b0e83f39734d21b008  gcc/te
*** 64150,64155 ****
--- 64156,64162 ----
  b5f3dac0a4aa3e456482d4b3162d64b6  gcc/testsuite/gcc.target/avr/torture/pr125409-fx24-uuk.c
  f5a1361523de0e3faf7dfdd815bbaedf  gcc/testsuite/gcc.target/avr/torture/pr125409-fx24-uur.c
  33205c0601ab01f0a0bb4fcfdc9bd796  gcc/testsuite/gcc.target/avr/torture/pr125409.h
+ a191de98a42b86fd465aa24b4f900324  gcc/testsuite/gcc.target/avr/torture/pr127098.c
  0844a939ea2464d30cc8892c85b4aecc  gcc/testsuite/gcc.target/avr/torture/pr39633.c
  8fb17af722ee890b7fa08b5610cdb80e  gcc/testsuite/gcc.target/avr/torture/pr41885.c
  70b849f57ecf42299230b99b7734dd2d  gcc/testsuite/gcc.target/avr/torture/pr51374-1.c
*************** c10dc1a11bed8461c36db2d370f534b6  gcc/tr
*** 100716,100726 ****
  d64db354e8b15e125e29a328c68f0612  gcc/tree-ssa-loop-unswitch.cc
  e2040b0e641b28b006e48fb2094500e2  gcc/tree-ssa-loop.cc
  943d41105325f8de1cdae2b4faf2dd0a  gcc/tree-ssa-loop.h
! 0dc27fa6c814c52818eec5f55843b70c  gcc/tree-ssa-math-opts.cc
  e9484a6f5b1f9056c6681cedce910ed4  gcc/tree-ssa-math-opts.h
  918abd54b699b48204a42158c4379381  gcc/tree-ssa-operands.cc
  0db421e827039fe3c4f796b4c7600c52  gcc/tree-ssa-operands.h
! 883157a3980cdc9b09253fd64e7b4f95  gcc/tree-ssa-phiopt.cc
  731542d52a45ac5f609554aee9faf6dd  gcc/tree-ssa-phiprop.cc
  996d006bce38c28f8906e3d735d3c63f  gcc/tree-ssa-pre.cc
  fa89601dd394c5e02d327c2c2aebf80e  gcc/tree-ssa-propagate.cc
--- 100723,100733 ----
  d64db354e8b15e125e29a328c68f0612  gcc/tree-ssa-loop-unswitch.cc
  e2040b0e641b28b006e48fb2094500e2  gcc/tree-ssa-loop.cc
  943d41105325f8de1cdae2b4faf2dd0a  gcc/tree-ssa-loop.h
! 77da4133df9c8452382c403a490589aa  gcc/tree-ssa-math-opts.cc
  e9484a6f5b1f9056c6681cedce910ed4  gcc/tree-ssa-math-opts.h
  918abd54b699b48204a42158c4379381  gcc/tree-ssa-operands.cc
  0db421e827039fe3c4f796b4c7600c52  gcc/tree-ssa-operands.h
! f574f527c18df7c89c7ed22450b162e6  gcc/tree-ssa-phiopt.cc
  731542d52a45ac5f609554aee9faf6dd  gcc/tree-ssa-phiprop.cc
  996d006bce38c28f8906e3d735d3c63f  gcc/tree-ssa-pre.cc
  fa89601dd394c5e02d327c2c2aebf80e  gcc/tree-ssa-propagate.cc
*************** cffdeae41b78da05839b193e90188f55  libcod
*** 101139,101145 ****
  6419dfc879387358e95288142e569914  libcody/packet.cc
  688ece05c8b9d378b3df186808162e76  libcody/resolver.cc
  c94add0032978604acf65591bb86d2d6  libcody/server.cc
! 855ecda43d5c1150e9d6bd66ac06f069  libcpp/ChangeLog
  2bd831b17997584e38305782cebe6948  libcpp/ChangeLog.jit
  c0a6ef2c7117069e80a305c7adaf1650  libcpp/Makefile.in
  9d15bb14e9ac1a74366e673ea260722e  libcpp/aclocal.m4
--- 101146,101152 ----
  6419dfc879387358e95288142e569914  libcody/packet.cc
  688ece05c8b9d378b3df186808162e76  libcody/resolver.cc
  c94add0032978604acf65591bb86d2d6  libcody/server.cc
! e2b45f330d5877f5dda86b1e51db1b53  libcpp/ChangeLog
  2bd831b17997584e38305782cebe6948  libcpp/ChangeLog.jit
  c0a6ef2c7117069e80a305c7adaf1650  libcpp/Makefile.in
  9d15bb14e9ac1a74366e673ea260722e  libcpp/aclocal.m4
*************** fdb620c15e6f934b317e2311ee26683e  libcpp
*** 101162,101168 ****
  f782b3f8758e5c71f8803e8fbf2f59a8  libcpp/lex.cc
  9069946f6da4520e2be3263aba1fc15b  libcpp/line-map.cc
  46a07100f95f5e354c7e25cd19d26884  libcpp/location-example.txt
! ff413cbf5d61faa394a5ab2ef711257d  libcpp/macro.cc
  ab776697d1c83f80b45ce82ce889ce27  libcpp/makeucnid.cc
  8200bcdbc955945f7651606e2f838c81  libcpp/makeuname2c.cc
  686ab269c27d4ae5268d12330ce28ee1  libcpp/mkdeps.cc
--- 101169,101175 ----
  f782b3f8758e5c71f8803e8fbf2f59a8  libcpp/lex.cc
  9069946f6da4520e2be3263aba1fc15b  libcpp/line-map.cc
  46a07100f95f5e354c7e25cd19d26884  libcpp/location-example.txt
! 21686ec48e8770e419ef2bf1920f4eb7  libcpp/macro.cc
  ab776697d1c83f80b45ce82ce889ce27  libcpp/makeucnid.cc
  8200bcdbc955945f7651606e2f838c81  libcpp/makeuname2c.cc
  686ab269c27d4ae5268d12330ce28ee1  libcpp/mkdeps.cc
diff -Nrcpad gcc-13-20260826/gcc/ChangeLog gcc-13-20260902/gcc/ChangeLog
*** gcc-13-20260826/gcc/ChangeLog	Wed Aug 26 22:32:06 2026
--- gcc-13-20260902/gcc/ChangeLog	Wed Sep  2 22:32:05 2026
***************
*** 1,3 ****
--- 1,46 ----
+ 2026-08-29  Georg-Johann Lay  <avr@gjlay.de>
+ 
+ 	Backported from master:
+ 	2026-08-29  Georg-Johann Lay  <avr@gjlay.de>
+ 
+ 	PR middle-end/127098
+ 	* config/avr/avr.md (MPUSH): Add TImode to mode iterator.
+ 	* config/avr/avr.h (PUSH_ROUNDING): Adjust comment.
+ 
+ 2026-08-27  Jakub Jelinek  <jakub@redhat.com>
+ 
+ 	Backported from master:
+ 	2026-08-04  Jakub Jelinek  <jakub@redhat.com>
+ 
+ 	PR tree-optimization/126601
+ 	* tree-ssa-math-opts.cc (maybe_optimize_guarding_check): Use safe_push
+ 	on mul_stmts rather than quick_push.
+ 
+ 2026-08-27  Jakub Jelinek  <jakub@redhat.com>
+ 
+ 	Backported from master:
+ 	2026-08-04  Jakub Jelinek  <jakub@redhat.com>
+ 
+ 	PR tree-optimization/126564
+ 	* tree-ssa-phiopt.cc (spaceship_replacement): Fix up condition
+ 	when to punt because of redundant cmp1 with cmp2, xor in
+ 	lhs1 == lhs2 with difference of cmp2 from cmp1 (ignoring
+ 	LT_EXPR vs. LE_EXPR and GT_EXPR vs. GE_EXPR differences) and
+ 	1 if cond2_phi_edge is EDGE_FALSE_VALUE.
+ 
+ 2026-08-27  Jakub Jelinek  <jakub@redhat.com>
+ 
+ 	Backported from master:
+ 	2026-08-03  Jakub Jelinek  <jakub@redhat.com>
+ 
+ 	PR target/126484
+ 	* config/mips/mips-ftypes.def (MIPS_SI_FTYPE_VOID,
+ 	MIPS_USI_FTYPE_VOID): Use DEF_MIPS_FTYPE with 0 as
+ 	first argument rather than 1 and leave out ", VOID" from
+ 	second argument.
+ 	* config/mips/mips.cc (MIPS_FTYPE_NAME0): Define.
+ 	(MIPS_FTYPE_ATYPES0): Define.
+ 
  2026-08-20  Marek Polacek  <polacek@redhat.com>
  
  	Backported from master:
diff -Nrcpad gcc-13-20260826/gcc/DATESTAMP gcc-13-20260902/gcc/DATESTAMP
*** gcc-13-20260826/gcc/DATESTAMP	Wed Aug 26 22:32:06 2026
--- gcc-13-20260902/gcc/DATESTAMP	Wed Sep  2 22:32:05 2026
***************
*** 1 ****
! 20260826
--- 1 ----
! 20260902
diff -Nrcpad gcc-13-20260826/gcc/config/avr/avr.h gcc-13-20260902/gcc/config/avr/avr.h
*** gcc-13-20260826/gcc/config/avr/avr.h	Wed Aug 26 22:32:07 2026
--- gcc-13-20260902/gcc/config/avr/avr.h	Wed Sep  2 22:32:06 2026
*************** enum reg_class {
*** 322,331 ****
  
  #define RETURN_ADDR_RTX(count, tem) avr_return_addr_rtx (count, tem)
  
- /* Don't use Push rounding. expr.cc: emit_single_push_insn is broken 
-    for POST_DEC targets (PR27386).  */
- /*#define PUSH_ROUNDING(NPUSHED) (NPUSHED)*/
- 
  typedef struct avr_args
  {
    /* # Registers available for passing */
--- 322,327 ----
*************** struct GTY(()) machine_function
*** 595,601 ****
  };
  
  /* AVR does not round pushes, but the existence of this macro is
!    required in order for pushes to be generated.  */
  #define PUSH_ROUNDING(X)	(X)
  
  /* Define prototype here to avoid build warning.  Some files using
--- 591,601 ----
  };
  
  /* AVR does not round pushes, but the existence of this macro is
!    required in order for pushes to be generated.
!    This macro was removed for PR27386 and then later re-added when
!    push insns were introduced.  Push insns can work around broken
!    argument setup in expr.cc that doesn't work properly for
!    STACK_GROWS_DOWNWARDS + POST_DEC push, see PR127098.  */
  #define PUSH_ROUNDING(X)	(X)
  
  /* Define prototype here to avoid build warning.  Some files using
diff -Nrcpad gcc-13-20260826/gcc/config/avr/avr.md gcc-13-20260902/gcc/config/avr/avr.md
*** gcc-13-20260826/gcc/config/avr/avr.md	Wed Aug 26 22:32:07 2026
--- gcc-13-20260902/gcc/config/avr/avr.md	Wed Sep  2 22:32:06 2026
***************
*** 425,431 ****
     HI CHI HA UHA HQ UHQ
     SI CSI SA USA SQ USQ
     DI CDI DA UDA DQ UDQ
!    TA UTA
     SF DF SC DC
     PSI])
  
--- 425,431 ----
     HI CHI HA UHA HQ UHQ
     SI CSI SA USA SQ USQ
     DI CDI DA UDA DQ UDQ
!    TA UTA TI
     SF DF SC DC
     PSI])
  
diff -Nrcpad gcc-13-20260826/gcc/config/mips/mips-ftypes.def gcc-13-20260902/gcc/config/mips/mips-ftypes.def
*** gcc-13-20260826/gcc/config/mips/mips-ftypes.def	Wed Aug 26 22:32:07 2026
--- gcc-13-20260902/gcc/config/mips/mips-ftypes.def	Wed Sep  2 22:32:06 2026
*************** DEF_MIPS_FTYPE (1, (SI, V4QI))
*** 75,81 ****
  DEF_MIPS_FTYPE (2, (SI, V4QI, V4QI))
  DEF_MIPS_FTYPE (2, (SI, V4SI, UQI))
  DEF_MIPS_FTYPE (2, (SI, V8HI, UQI))
! DEF_MIPS_FTYPE (1, (SI, VOID))
  
  DEF_MIPS_FTYPE (2, (UDI, UDI, UDI))
  DEF_MIPS_FTYPE (2, (UDI, UV2SI, UV2SI))
--- 75,81 ----
  DEF_MIPS_FTYPE (2, (SI, V4QI, V4QI))
  DEF_MIPS_FTYPE (2, (SI, V4SI, UQI))
  DEF_MIPS_FTYPE (2, (SI, V8HI, UQI))
! DEF_MIPS_FTYPE (0, (SI))
  
  DEF_MIPS_FTYPE (2, (UDI, UDI, UDI))
  DEF_MIPS_FTYPE (2, (UDI, UV2SI, UV2SI))
*************** DEF_MIPS_FTYPE (2, (UDI, V2DI, UQI))
*** 84,90 ****
  DEF_MIPS_FTYPE (2, (USI, V16QI, UQI))
  DEF_MIPS_FTYPE (2, (USI, V4SI, UQI))
  DEF_MIPS_FTYPE (2, (USI, V8HI, UQI))
! DEF_MIPS_FTYPE (1, (USI, VOID))
  
  DEF_MIPS_FTYPE (2, (UV16QI, UV16QI, UQI))
  DEF_MIPS_FTYPE (2, (UV16QI, UV16QI, UV16QI))
--- 84,90 ----
  DEF_MIPS_FTYPE (2, (USI, V16QI, UQI))
  DEF_MIPS_FTYPE (2, (USI, V4SI, UQI))
  DEF_MIPS_FTYPE (2, (USI, V8HI, UQI))
! DEF_MIPS_FTYPE (0, (USI))
  
  DEF_MIPS_FTYPE (2, (UV16QI, UV16QI, UQI))
  DEF_MIPS_FTYPE (2, (UV16QI, UV16QI, UV16QI))
diff -Nrcpad gcc-13-20260826/gcc/config/mips/mips.cc gcc-13-20260902/gcc/config/mips/mips.cc
*** gcc-13-20260826/gcc/config/mips/mips.cc	Wed Aug 26 22:32:07 2026
--- gcc-13-20260902/gcc/config/mips/mips.cc	Wed Sep  2 22:32:06 2026
*************** enum mips_ucbranch_type
*** 211,216 ****
--- 211,217 ----
  };
  
  /* Macros to create an enumeration identifier for a function prototype.  */
+ #define MIPS_FTYPE_NAME0(A) MIPS_##A##_FTYPE_VOID
  #define MIPS_FTYPE_NAME1(A, B) MIPS_##A##_FTYPE_##B
  #define MIPS_FTYPE_NAME2(A, B, C) MIPS_##A##_FTYPE_##B##_##C
  #define MIPS_FTYPE_NAME3(A, B, C, D) MIPS_##A##_FTYPE_##B##_##C##_##D
*************** mips_build_cvpointer_type (void)
*** 16760,16765 ****
--- 16761,16769 ----
  
  /* MIPS_FTYPE_ATYPESN takes N MIPS_FTYPES-like type codes and lists
     their associated MIPS_ATYPEs.  */
+ #define MIPS_FTYPE_ATYPES0(A) \
+   MIPS_ATYPE_##A
+ 
  #define MIPS_FTYPE_ATYPES1(A, B) \
    MIPS_ATYPE_##A, MIPS_ATYPE_##B
  
diff -Nrcpad gcc-13-20260826/gcc/testsuite/ChangeLog gcc-13-20260902/gcc/testsuite/ChangeLog
*** gcc-13-20260826/gcc/testsuite/ChangeLog	Wed Aug 26 22:32:10 2026
--- gcc-13-20260902/gcc/testsuite/ChangeLog	Wed Sep  2 22:32:09 2026
***************
*** 1,3 ****
--- 1,69 ----
+ 2026-08-29  Georg-Johann Lay  <avr@gjlay.de>
+ 
+ 	Backported from master:
+ 	2026-08-29  Georg-Johann Lay  <avr@gjlay.de>
+ 
+ 	PR middle-end/127098
+ 	* gcc.target/avr/torture/pr127098.c: New test.
+ 
+ 2026-08-27  Jakub Jelinek  <jakub@redhat.com>
+ 
+ 	Backported from master:
+ 	2026-08-06  Jakub Jelinek  <jakub@redhat.com>
+ 
+ 	PR preprocessor/125048
+ 	* c-c++-common/cpp/va-opt-11.c: New test.
+ 
+ 2026-08-27  Jakub Jelinek  <jakub@redhat.com>
+ 
+ 	Backported from master:
+ 	2026-08-04  Jakub Jelinek  <jakub@redhat.com>
+ 
+ 	PR tree-optimization/126464
+ 	* gcc.dg/pr126464.c: Guard uses of 1e300 with
+ 	__DBL_MAX_10_EXP__ >= 301 and uses of 1e4000L with
+ 	__LDBL_MAX_10_EXP__ >= 4001.
+ 
+ 2026-08-27  Jakub Jelinek  <jakub@redhat.com>
+ 
+ 	Backported from master:
+ 	2026-08-04  Jakub Jelinek  <jakub@redhat.com>
+ 
+ 	PR tree-optimization/126601
+ 	* gcc.dg/tree-ssa/pr126601.c: New test.
+ 
+ 2026-08-27  Jakub Jelinek  <jakub@redhat.com>
+ 
+ 	Backported from master:
+ 	2026-08-04  Jakub Jelinek  <jakub@redhat.com>
+ 
+ 	PR tree-optimization/126564
+ 	* gcc.dg/torture/pr126564.c: New test.
+ 
+ 2026-08-27  Jakub Jelinek  <jakub@redhat.com>
+ 
+ 	Backported from master:
+ 	2026-08-03  Jakub Jelinek  <jakub@redhat.com>
+ 
+ 	PR tree-optimization/126547
+ 	* gcc.dg/torture/pr126547.c: New test.
+ 
+ 2026-08-27  Jakub Jelinek  <jakub@redhat.com>
+ 
+ 	Backported from master:
+ 	2026-08-03  Jakub Jelinek  <jakub@redhat.com>
+ 
+ 	PR tree-optimization/126576
+ 	* gcc.dg/torture/pr126576.c: New test.
+ 
+ 2026-08-27  Jakub Jelinek  <jakub@redhat.com>
+ 
+ 	Backported from master:
+ 	2026-08-03  Jakub Jelinek  <jakub@redhat.com>
+ 
+ 	PR target/126484
+ 	* g++.target/mips/pr126484.C: New test.
+ 
  2026-08-20  Marek Polacek  <polacek@redhat.com>
  
  	Backported from master:
diff -Nrcpad gcc-13-20260826/gcc/testsuite/c-c++-common/cpp/va-opt-11.c gcc-13-20260902/gcc/testsuite/c-c++-common/cpp/va-opt-11.c
*** gcc-13-20260826/gcc/testsuite/c-c++-common/cpp/va-opt-11.c	Thu Jan  1 00:00:00 1970
--- gcc-13-20260902/gcc/testsuite/c-c++-common/cpp/va-opt-11.c	Wed Sep  2 22:32:09 2026
***************
*** 0 ****
--- 1,13 ----
+ /* PR preprocessor/125048 */
+ /* { dg-do preprocess } */
+ /* { dg-options "-std=c2x" { target c } } */
+ /* { dg-options "-std=c++20" { target c++ } } */
+ 
+ #define A(...)B(B(B(B(__VA_ARGS__##__VA_OPT__()))))
+ #define B(...)C(C(C(C(__VA_ARGS__##__VA_OPT__()))))
+ #define C(...)D(D(D(D(__VA_ARGS__##__VA_OPT__()))))
+ #define D(...)E(E(E(E(__VA_ARGS__##__VA_OPT__()))))
+ #define E(...)__VA_ARGS__
+ #define F
+ A(F)
+ /* { dg-final { scan-file va-opt-11.i "D\\\(D\\\(D\\\(C\\\(C\\\(C\\\(B\\\(B\\\(B\\\(\\\)\\\)\\\)\\\)\\\)\\\)\\\)\\\)\\\)" } } */
diff -Nrcpad gcc-13-20260826/gcc/testsuite/g++.target/mips/pr126484.C gcc-13-20260902/gcc/testsuite/g++.target/mips/pr126484.C
*** gcc-13-20260826/gcc/testsuite/g++.target/mips/pr126484.C	Thu Jan  1 00:00:00 1970
--- gcc-13-20260902/gcc/testsuite/g++.target/mips/pr126484.C	Wed Sep  2 22:32:10 2026
***************
*** 0 ****
--- 1,8 ----
+ // PR target/126484
+ // { dg-do compile }
+ 
+ int
+ foo ()
+ {
+   return __builtin_mips_get_fcsr ();
+ }
diff -Nrcpad gcc-13-20260826/gcc/testsuite/gcc.dg/pr126464.c gcc-13-20260902/gcc/testsuite/gcc.dg/pr126464.c
*** gcc-13-20260826/gcc/testsuite/gcc.dg/pr126464.c	Wed Aug 26 22:32:13 2026
--- gcc-13-20260902/gcc/testsuite/gcc.dg/pr126464.c	Wed Sep  2 22:32:11 2026
*************** qux (long double x)
*** 47,61 ****
--- 47,65 ----
  int
  main ()
  {
+ #if __DBL_MAX_10_EXP__ >= 301
    if (!__builtin_isinf ((double) 1e300)
        && __builtin_isinf ((float) 1e300)
        && (foo (-1e300) != -5e299
  	  || baz (1e300) != 5e299))
      __builtin_abort ();
+ #endif
  
+ #if __LDBL_MAX_10_EXP__ >= 4001
    if (!__builtin_isinf ((long double) 1e4000L)
        && __builtin_isinf ((double) 1e4000L)
        && (bar (1e4000L) != 5e3999L
  	  || qux (-1e4000L) != -5e3999L))
      __builtin_abort ();
+ #endif
  }
diff -Nrcpad gcc-13-20260826/gcc/testsuite/gcc.dg/torture/pr126547.c gcc-13-20260902/gcc/testsuite/gcc.dg/torture/pr126547.c
*** gcc-13-20260826/gcc/testsuite/gcc.dg/torture/pr126547.c	Thu Jan  1 00:00:00 1970
--- gcc-13-20260902/gcc/testsuite/gcc.dg/torture/pr126547.c	Wed Sep  2 22:32:11 2026
***************
*** 0 ****
--- 1,31 ----
+ /* PR tree-optimization/126547 */
+ /* { dg-do run } */
+ 
+ #if __LDBL_HAS_INFINITY__
+ [[gnu::noipa]] static int
+ foo (long double a1, long double a2)
+ {
+   if (a1 >= 1.0 && a1 <= 8.0)
+     {
+       long double d = a1 / a2;
+       int n = 0;
+       if (d >= __builtin_infl ())
+ 	n += 1;
+       if (a2 > 0.0L)
+ 	n += 2;
+       return n;
+     }
+   else
+     return -1;
+ }
+ #endif
+ 
+ int
+ main ()
+ {
+ #if __LDBL_HAS_INFINITY__
+   if (__builtin_isinf (1.0 / __LDBL_DENORM_MIN__)
+       && foo (1.0, __LDBL_DENORM_MIN__) != 3)
+     __builtin_abort ();
+ #endif
+ }
diff -Nrcpad gcc-13-20260826/gcc/testsuite/gcc.dg/torture/pr126564.c gcc-13-20260902/gcc/testsuite/gcc.dg/torture/pr126564.c
*** gcc-13-20260826/gcc/testsuite/gcc.dg/torture/pr126564.c	Thu Jan  1 00:00:00 1970
--- gcc-13-20260902/gcc/testsuite/gcc.dg/torture/pr126564.c	Wed Sep  2 22:32:11 2026
***************
*** 0 ****
--- 1,25 ----
+ /* PR tree-optimization/126564 */
+ /* { dg-do run } */
+ 
+ __attribute__((noipa)) int
+ foo (int x, int y)
+ {
+   int c = 2;
+   if (x == y)
+     c = 0;
+   else if (x < y)
+     c = -1;
+   else if (x <= y)
+     c = 1;
+   return c == 1;
+ }
+ 
+ int
+ main ()
+ {
+   int i, j;
+   for (i = -3; i <= 3; i++)
+     for (j = -3; j <= 3; j++)
+       if (foo (i, j) != 0)
+ 	__builtin_abort ();
+ }
diff -Nrcpad gcc-13-20260826/gcc/testsuite/gcc.dg/torture/pr126576.c gcc-13-20260902/gcc/testsuite/gcc.dg/torture/pr126576.c
*** gcc-13-20260826/gcc/testsuite/gcc.dg/torture/pr126576.c	Thu Jan  1 00:00:00 1970
--- gcc-13-20260902/gcc/testsuite/gcc.dg/torture/pr126576.c	Wed Sep  2 22:32:11 2026
***************
*** 0 ****
--- 1,43 ----
+ /* PR tree-optimization/126576 */
+ /* { dg-do run } */
+ 
+ #if __DBL_MANT_DIG__ == 53 && __DBL_MAX_10_EXP__ == 308 \
+     && __DBL_HAS_INFINITY__ && __FLT_EVAL_METHOD__ == 0
+ int v;
+ 
+ [[gnu::noipa]] void
+ bar (int x)
+ {
+   v |= x;
+ }
+ 
+ [[gnu::noipa]] double
+ foo (double x)
+ {
+   double a = x * x;
+   if (__builtin_isinf (a) && !__builtin_isinf (x))
+     bar (1);
+   double b = a * 3.0;
+   if (__builtin_isinf (b) && !__builtin_isinf (a))
+     bar (2);
+   return b;
+ }
+ #endif
+ 
+ int
+ main ()
+ {
+ #if __DBL_MANT_DIG__ == 53 && __DBL_MAX_10_EXP__ == 308 \
+     && __DBL_HAS_INFINITY__ && __FLT_EVAL_METHOD__ == 0
+   foo (1e154);
+   if (v != 2)
+     __builtin_abort ();
+   v = 0;
+   foo (1e152);
+   if (v != 0)
+     __builtin_abort ();
+   foo (1e155);
+   if (v != 1)
+     __builtin_abort ();
+ #endif    
+ }
diff -Nrcpad gcc-13-20260826/gcc/testsuite/gcc.dg/tree-ssa/pr126601.c gcc-13-20260902/gcc/testsuite/gcc.dg/tree-ssa/pr126601.c
*** gcc-13-20260826/gcc/testsuite/gcc.dg/tree-ssa/pr126601.c	Thu Jan  1 00:00:00 1970
--- gcc-13-20260902/gcc/testsuite/gcc.dg/tree-ssa/pr126601.c	Wed Sep  2 22:32:11 2026
***************
*** 0 ****
--- 1,29 ----
+ /* PR tree-optimization/126601 */
+ /* { dg-do compile } */
+ /* { dg-options "-Os" } */
+ 
+ volatile int c[16];
+ 
+ [[gnu::noipa]] int
+ foo (unsigned x, unsigned y)
+ {
+   unsigned r = x * y;
+   int t = 0;
+   if (c[0]) { int u = 0; if (x != 0) u = (r / x != y); t += u; }
+   if (c[1]) { int u = 0; if (x != 0) u = (r / x != y); t += u; }
+   if (c[2]) { int u = 0; if (x != 0) u = (r / x != y); t += u; }
+   if (c[3]) { int u = 0; if (x != 0) u = (r / x != y); t += u; }
+   if (c[4]) { int u = 0; if (x != 0) u = (r / x != y); t += u; }
+   if (c[5]) { int u = 0; if (x != 0) u = (r / x != y); t += u; }
+   if (c[6]) { int u = 0; if (x != 0) u = (r / x != y); t += u; }
+   if (c[7]) { int u = 0; if (x != 0) u = (r / x != y); t += u; }
+   if (c[8]) { int u = 0; if (x != 0) u = (r / x != y); t += u; }
+   if (c[9]) { int u = 0; if (x != 0) u = (r / x != y); t += u; }
+   if (c[10]) { int u = 0; if (x != 0) u = (r / x != y); t += u; }
+   if (c[11]) { int u = 0; if (x != 0) u = (r / x != y); t += u; }
+   if (c[12]) { int u = 0; if (x != 0) u = (r / x != y); t += u; }
+   if (c[13]) { int u = 0; if (x != 0) u = (r / x != y); t += u; }
+   if (c[14]) { int u = 0; if (x != 0) u = (r / x != y); t += u; }
+   if (c[15]) { int u = 0; if (x != 0) u = (r / x != y); t += u; }
+   return t;
+ }
diff -Nrcpad gcc-13-20260826/gcc/testsuite/gcc.target/avr/torture/pr127098.c gcc-13-20260902/gcc/testsuite/gcc.target/avr/torture/pr127098.c
*** gcc-13-20260826/gcc/testsuite/gcc.target/avr/torture/pr127098.c	Thu Jan  1 00:00:00 1970
--- gcc-13-20260902/gcc/testsuite/gcc.target/avr/torture/pr127098.c	Wed Sep  2 22:32:12 2026
***************
*** 0 ****
--- 1,21 ----
+ /* { dg-do run } */
+ 
+ #define NI __attribute((noipa))
+ 
+ typedef char U __attribute__ ((vector_size (16)));
+ 
+ NI void fun (long i, U u)
+ {
+   (void) i;
+   if (u[0] != 1)
+     __builtin_abort ();
+ }
+ 
+ U u = { 1 };
+ 
+ int main (void)
+ {
+   fun (0, u);
+ 
+   return 0;
+ }
diff -Nrcpad gcc-13-20260826/gcc/tree-ssa-math-opts.cc gcc-13-20260902/gcc/tree-ssa-math-opts.cc
*** gcc-13-20260826/gcc/tree-ssa-math-opts.cc	Wed Aug 26 22:32:17 2026
--- gcc-13-20260902/gcc/tree-ssa-math-opts.cc	Wed Sep  2 22:32:14 2026
*************** maybe_optimize_guarding_check (vec<gimpl
*** 3645,3651 ****
  	return;
      }
    gimple_stmt_iterator gsi = gsi_after_labels (bb);
!   mul_stmts.quick_push (div_stmt);
    if (is_gimple_debug (gsi_stmt (gsi)))
      gsi_next_nondebug (&gsi);
    unsigned cast_count = 0;
--- 3645,3651 ----
  	return;
      }
    gimple_stmt_iterator gsi = gsi_after_labels (bb);
!   mul_stmts.safe_push (div_stmt);
    if (is_gimple_debug (gsi_stmt (gsi)))
      gsi_next_nondebug (&gsi);
    unsigned cast_count = 0;
diff -Nrcpad gcc-13-20260826/gcc/tree-ssa-phiopt.cc gcc-13-20260902/gcc/tree-ssa-phiopt.cc
*** gcc-13-20260826/gcc/tree-ssa-phiopt.cc	Wed Aug 26 22:32:17 2026
--- gcc-13-20260902/gcc/tree-ssa-phiopt.cc	Wed Sep  2 22:32:14 2026
*************** spaceship_replacement (basic_block cond_
*** 2766,2777 ****
  	 or the comparisons are the same and operands not swapped,
  	 or the true and false edges are swapped, it is not.  */
        if ((lhs2 == lhs1)
! 	  ^ (((cond2_phi_edge->flags
! 	       & ((cmp2 == LT_EXPR || cmp2 == LE_EXPR)
! 		  ? EDGE_TRUE_VALUE : EDGE_FALSE_VALUE)) != 0)
! 	     != ((e1->flags
! 		  & ((cmp1 == LT_EXPR || cmp1 == LE_EXPR)
! 		     ? EDGE_TRUE_VALUE : EDGE_FALSE_VALUE)) != 0)))
  	return false;
        if (!single_pred_p (cond2_bb) || !cond_only_block_p (cond2_bb))
  	return false;
--- 2766,2774 ----
  	 or the comparisons are the same and operands not swapped,
  	 or the true and false edges are swapped, it is not.  */
        if ((lhs2 == lhs1)
! 	  ^ ((cmp2 == LT_EXPR || cmp2 == LE_EXPR)
! 	     != (cmp1 == LT_EXPR || cmp1 == LE_EXPR))
! 	  ^ ((cond2_phi_edge->flags & EDGE_FALSE_VALUE) != 0))
  	return false;
        if (!single_pred_p (cond2_bb) || !cond_only_block_p (cond2_bb))
  	return false;
diff -Nrcpad gcc-13-20260826/libcpp/ChangeLog gcc-13-20260902/libcpp/ChangeLog
*** gcc-13-20260826/libcpp/ChangeLog	Wed Aug 26 22:32:17 2026
--- gcc-13-20260902/libcpp/ChangeLog	Wed Sep  2 22:32:14 2026
***************
*** 1,3 ****
--- 1,14 ----
+ 2026-08-27  Jakub Jelinek  <jakub@redhat.com>
+ 
+ 	Backported from master:
+ 	2026-08-06  Jakub Jelinek  <jakub@redhat.com>
+ 
+ 	PR preprocessor/125048
+ 	* macro.cc (replace_args): Remember the position of map
+ 	in the pfile->line_table->info_macro.maps array and if vostate
+ 	is DROP, recompute map pointer as expand_arg call could have
+ 	reallocated the pfile->line_table->info_macro.maps array.
+ 
  2026-03-22  Jakub Jelinek  <jakub@redhat.com>
  
  	Backported from master:
diff -Nrcpad gcc-13-20260826/libcpp/macro.cc gcc-13-20260902/libcpp/macro.cc
*** gcc-13-20260826/libcpp/macro.cc	Wed Aug 26 22:32:17 2026
--- gcc-13-20260902/libcpp/macro.cc	Wed Sep  2 22:32:14 2026
*************** replace_args (cpp_reader *pfile, cpp_has
*** 1898,1903 ****
--- 1898,1904 ----
    location_t *virt_locs = NULL;
    unsigned int exp_count;
    const line_map_macro *map = NULL;
+   size_t map_idx = 0;
    int track_macro_exp;
  
    /* First, fully macro-expand arguments, calculating the number of
*************** replace_args (cpp_reader *pfile, cpp_has
*** 2008,2013 ****
--- 2009,2015 ----
        map = linemap_enter_macro (pfile->line_table, node,
  				 expansion_point_loc,
  				 num_macro_tokens);
+       map_idx = map - pfile->line_table->info_macro.maps;
      }
    i = 0;
    vaopt_state vaopt_tracker (pfile, macro->variadic, &args[macro->paramc - 1]);
*************** replace_args (cpp_reader *pfile, cpp_has
*** 2129,2134 ****
--- 2131,2141 ----
  					 NULL, 0);
  		}
  	    }
+ 	  else if (vostate == vaopt_state::DROP && map)
+ 	    /* For the DROP case vaopt_tracker.update (src) can call
+ 	       expand_arg and that can reallocate the maps, so need to
+ 	       update the map pointer.  */
+ 	    map = pfile->line_table->info_macro.maps + map_idx;
  	  continue;
  	}
  
