diff --git a/notify/configure-toolchain.txt b/notify/configure-toolchain.txt
index ae4bd376..ccf8155a 100644
--- a/notify/configure-toolchain.txt
+++ b/notify/configure-toolchain.txt
@@ -3,17 +3,3 @@ Most relevant configure and test flags: none, autodetected on aarch64-unknown-li
 
 Full configure and make flags for each step:
 
-# 03-build_abe-bootstrap
-(cd /home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2 && /bin/bash /home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/snapshots/gcc.git~master/configure SHELL=/bin/bash  --with-mpc=/home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/destdir/aarch64-unknown-linux-gnu --with-mpfr=/home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/destdir/aarch64-unknown-linux-gnu --with-gmp=/home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/destdir/aarch64-unknown-linux-gnu --with-gnu-as --with-gnu-ld --disable-libmudflap --enable-lto --enable-shared --without-included-gettext --enable-nls --with-system-zlib --disable-sjlj-exceptions --enable-gnu-unique-object --enable-linker-build-id --disable-libstdcxx-pch --enable-c99 --enable-clocale=gnu --enable-libstdcxx-debug --enable-long-long --with-cloog=no --with-ppl=no --with-isl=no --disable-multilib --enable-fix-cortex-a53-835769 --enable-fix-cortex-a53-843419 --with-arch=armv8-a --enable-threads=posix --enable-multiarch --enable-libstdcxx-time=yes --enable-gnu-indirect-function --enable-checking=yes --enable-bootstrap --enable-languages=default --prefix=/home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/destdir/aarch64-unknown-linux-gnu )
-make SHELL=/bin/bash -w -C /home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2  -j 160 LDFLAGS_FOR_TARGET="-Wl,-fix-cortex-a53-843419"  CFLAGS_FOR_BUILD="-pipe -g -O2" CXXFLAGS_FOR_BUILD="-pipe -g -O2" LDFLAGS_FOR_BUILD="-static-libgcc" MAKEINFOFLAGS=--force 2>&1 | tee -a /home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2/make-gcc-stage2.log
-make install  -w -C /home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2 2>&1 | tee -a /home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2/make-gcc-stage2.log
-
-# 04-build_abe-dejagnu
-(cd /home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/dejagnu-dejagnu.git~linaro-local~stable && /bin/bash /home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/snapshots/dejagnu.git~linaro-local~stable/configure SHELL=/bin/bash   --build=aarch64-unknown-linux-gnu --host=aarch64-unknown-linux-gnu --prefix=/home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/hosttools/aarch64-unknown-linux-gnu)
-make SHELL=/bin/bash -w -C /home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/dejagnu-dejagnu.git~linaro-local~stable  -j 160 LDFLAGS_FOR_TARGET="-Wl,-fix-cortex-a53-843419"  CFLAGS_FOR_BUILD="-pipe -g -O2" CXXFLAGS_FOR_BUILD="-pipe -g -O2" LDFLAGS_FOR_BUILD="-static-libgcc" 2>&1 | tee -a /home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/dejagnu-dejagnu.git~linaro-local~stable/make-dejagnu.log
-make install  -w -C /home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/dejagnu-dejagnu.git~linaro-local~stable 2>&1 | tee -a /home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/dejagnu-dejagnu.git~linaro-local~stable/make-dejagnu.log
-
-# 05-build_abe-check_bootstrap
-make check FLAGS_UNDER_TEST="" PREFIX_UNDER_TEST="/home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/destdir/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-" QEMU_WRAPPER=/home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/scripts/qemu-wrapper.sh QEMU_CPU_UNDER_TEST=any ABE_TEST_CONTAINER=local  CFLAGS_FOR_BUILD="-pipe" CXXFLAGS_FOR_BUILD="-pipe" -j 160  -w -i -k -C /home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2/ >> /home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2/check-gcc.log 2>&1
-make check-target-libgomp FLAGS_UNDER_TEST="" PREFIX_UNDER_TEST="/home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/destdir/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-" QEMU_WRAPPER=/home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/scripts/qemu-wrapper.sh QEMU_CPU_UNDER_TEST=any ABE_TEST_CONTAINER=local  CFLAGS_FOR_BUILD="-pipe" CXXFLAGS_FOR_BUILD="-pipe" -j 160 RUNTESTFLAGS=" libgomp.c++/c++.exp" -w -i -k -C /home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2/ >> /home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2/check-gcc.log 2>&1
-
diff --git a/notify/lnt_report.json b/notify/lnt_report.json
index 75d74cb0..2f98a2e9 100644
--- a/notify/lnt_report.json
+++ b/notify/lnt_report.json
@@ -7,7 +7,7 @@
         "Info": {
             "tag": "tcwg_bootstrap_check",
             "test_url": "https://ci.linaro.org/job/tcwg_bootstrap_check--master-aarch64-check_bootstrap-build/1186/",
-            "run_order": "1186 (basepoints/gcc-16-01061-g49f421a31f63)",
+            "run_order": "1186 (basepoints/gcc-16-01061-g49f421a31f6)",
             "git_gcc": "git+ssh://linaroci@gcc.gnu.org/git/gcc.git (49f421a31f63405d3ca466e144d010c550206e72) (+ 9 commits)",
             "__report_version__": "1"
         },
@@ -40,10 +40,10 @@
 	   ,
         {
             "Data": [
-                0
+                42
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libstdc++.FAIL.nb_FAIL"
+            "Name": "tcwg_bootstrap_check.gcc.FAIL.nb_FAIL"
         }
 	   ,
         {
@@ -51,7 +51,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libstdc++.UNRESOLVED.nb_UNRESOLVED"
+            "Name": "tcwg_bootstrap_check.gcc.UNRESOLVED.nb_UNRESOLVED"
         }
 	   ,
         {
@@ -59,7 +59,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libstdc++.UNTESTED.nb_UNTESTED"
+            "Name": "tcwg_bootstrap_check.gcc.UNTESTED.nb_UNTESTED"
         }
 	   ,
         {
@@ -67,15 +67,15 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libstdc++.ERROR.nb_ERROR"
+            "Name": "tcwg_bootstrap_check.gcc.ERROR.nb_ERROR"
         }
 	   ,
         {
             "Data": [
-                0
+                5
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libstdc++.XPASS.nb_XPASS"
+            "Name": "tcwg_bootstrap_check.gcc.XPASS.nb_XPASS"
         }
 	   ,
         {
@@ -83,7 +83,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libstdc++.OTHER.nb_OTHER"
+            "Name": "tcwg_bootstrap_check.gcc.OTHER.nb_OTHER"
         }
 	   ,
         {
@@ -91,55 +91,55 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libstdc++.KFAIL.nb_KFAIL"
+            "Name": "tcwg_bootstrap_check.gcc.KFAIL.nb_KFAIL"
         }
 	   ,
         {
             "Data": [
-                131
+                1980
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libstdc++.XFAIL.nb_XFAIL"
+            "Name": "tcwg_bootstrap_check.gcc.XFAIL.nb_XFAIL"
         }
 	   ,
         {
             "Data": [
-                19453
+                386600
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libstdc++.PASS.nb_PASS"
+            "Name": "tcwg_bootstrap_check.gcc.PASS.nb_PASS"
         }
 	   ,
         {
             "Data": [
-                780
+                5704
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libstdc++.UNSUPPORTED.nb_UNSUPPORTED"
+            "Name": "tcwg_bootstrap_check.gcc.UNSUPPORTED.nb_UNSUPPORTED"
         }
 	   ,
         {
             "Data": [
-                20364
+                394284
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libstdc++.good.nb_good"
+            "Name": "tcwg_bootstrap_check.gcc.good.nb_good"
         }
 	   ,
         {
             "Data": [
-                0
+                47
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libstdc++.bad.nb_bad"
+            "Name": "tcwg_bootstrap_check.gcc.bad.nb_bad"
         }
 	   ,
         {
             "Data": [
-                2
+                0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gfortran.FAIL.nb_FAIL"
+            "Name": "tcwg_bootstrap_check.libitm.FAIL.nb_FAIL"
         }
 	   ,
         {
@@ -147,7 +147,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gfortran.UNRESOLVED.nb_UNRESOLVED"
+            "Name": "tcwg_bootstrap_check.libitm.UNRESOLVED.nb_UNRESOLVED"
         }
 	   ,
         {
@@ -155,7 +155,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gfortran.UNTESTED.nb_UNTESTED"
+            "Name": "tcwg_bootstrap_check.libitm.UNTESTED.nb_UNTESTED"
         }
 	   ,
         {
@@ -163,7 +163,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gfortran.ERROR.nb_ERROR"
+            "Name": "tcwg_bootstrap_check.libitm.ERROR.nb_ERROR"
         }
 	   ,
         {
@@ -171,7 +171,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gfortran.XPASS.nb_XPASS"
+            "Name": "tcwg_bootstrap_check.libitm.XPASS.nb_XPASS"
         }
 	   ,
         {
@@ -179,7 +179,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gfortran.OTHER.nb_OTHER"
+            "Name": "tcwg_bootstrap_check.libitm.OTHER.nb_OTHER"
         }
 	   ,
         {
@@ -187,47 +187,47 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gfortran.KFAIL.nb_KFAIL"
+            "Name": "tcwg_bootstrap_check.libitm.KFAIL.nb_KFAIL"
         }
 	   ,
         {
             "Data": [
-                333
+                3
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gfortran.XFAIL.nb_XFAIL"
+            "Name": "tcwg_bootstrap_check.libitm.XFAIL.nb_XFAIL"
         }
 	   ,
         {
             "Data": [
-                72561
+                44
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gfortran.PASS.nb_PASS"
+            "Name": "tcwg_bootstrap_check.libitm.PASS.nb_PASS"
         }
 	   ,
         {
             "Data": [
-                171
+                1
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gfortran.UNSUPPORTED.nb_UNSUPPORTED"
+            "Name": "tcwg_bootstrap_check.libitm.UNSUPPORTED.nb_UNSUPPORTED"
         }
 	   ,
         {
             "Data": [
-                73065
+                48
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gfortran.good.nb_good"
+            "Name": "tcwg_bootstrap_check.libitm.good.nb_good"
         }
 	   ,
         {
             "Data": [
-                2
+                0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gfortran.bad.nb_bad"
+            "Name": "tcwg_bootstrap_check.libitm.bad.nb_bad"
         }
 	   ,
         {
@@ -328,18 +328,18 @@
 	   ,
         {
             "Data": [
-                1
+                2
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libgomp.FAIL.nb_FAIL"
+            "Name": "tcwg_bootstrap_check.gfortran.FAIL.nb_FAIL"
         }
 	   ,
         {
             "Data": [
-                1
+                0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libgomp.UNRESOLVED.nb_UNRESOLVED"
+            "Name": "tcwg_bootstrap_check.gfortran.UNRESOLVED.nb_UNRESOLVED"
         }
 	   ,
         {
@@ -347,7 +347,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libgomp.UNTESTED.nb_UNTESTED"
+            "Name": "tcwg_bootstrap_check.gfortran.UNTESTED.nb_UNTESTED"
         }
 	   ,
         {
@@ -355,7 +355,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libgomp.ERROR.nb_ERROR"
+            "Name": "tcwg_bootstrap_check.gfortran.ERROR.nb_ERROR"
         }
 	   ,
         {
@@ -363,7 +363,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libgomp.XPASS.nb_XPASS"
+            "Name": "tcwg_bootstrap_check.gfortran.XPASS.nb_XPASS"
         }
 	   ,
         {
@@ -371,7 +371,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libgomp.OTHER.nb_OTHER"
+            "Name": "tcwg_bootstrap_check.gfortran.OTHER.nb_OTHER"
         }
 	   ,
         {
@@ -379,39 +379,39 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libgomp.KFAIL.nb_KFAIL"
+            "Name": "tcwg_bootstrap_check.gfortran.KFAIL.nb_KFAIL"
         }
 	   ,
         {
             "Data": [
-                284
+                333
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libgomp.XFAIL.nb_XFAIL"
+            "Name": "tcwg_bootstrap_check.gfortran.XFAIL.nb_XFAIL"
         }
 	   ,
         {
             "Data": [
-                17132
+                72561
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libgomp.PASS.nb_PASS"
+            "Name": "tcwg_bootstrap_check.gfortran.PASS.nb_PASS"
         }
 	   ,
         {
             "Data": [
-                728
+                171
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libgomp.UNSUPPORTED.nb_UNSUPPORTED"
+            "Name": "tcwg_bootstrap_check.gfortran.UNSUPPORTED.nb_UNSUPPORTED"
         }
 	   ,
         {
             "Data": [
-                18144
+                73065
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libgomp.good.nb_good"
+            "Name": "tcwg_bootstrap_check.gfortran.good.nb_good"
         }
 	   ,
         {
@@ -419,7 +419,7 @@
                 2
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libgomp.bad.nb_bad"
+            "Name": "tcwg_bootstrap_check.gfortran.bad.nb_bad"
         }
 	   ,
         {
@@ -427,7 +427,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libatomic.FAIL.nb_FAIL"
+            "Name": "tcwg_bootstrap_check.libstdc++.FAIL.nb_FAIL"
         }
 	   ,
         {
@@ -435,7 +435,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libatomic.UNRESOLVED.nb_UNRESOLVED"
+            "Name": "tcwg_bootstrap_check.libstdc++.UNRESOLVED.nb_UNRESOLVED"
         }
 	   ,
         {
@@ -443,7 +443,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libatomic.UNTESTED.nb_UNTESTED"
+            "Name": "tcwg_bootstrap_check.libstdc++.UNTESTED.nb_UNTESTED"
         }
 	   ,
         {
@@ -451,7 +451,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libatomic.ERROR.nb_ERROR"
+            "Name": "tcwg_bootstrap_check.libstdc++.ERROR.nb_ERROR"
         }
 	   ,
         {
@@ -459,7 +459,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libatomic.XPASS.nb_XPASS"
+            "Name": "tcwg_bootstrap_check.libstdc++.XPASS.nb_XPASS"
         }
 	   ,
         {
@@ -467,7 +467,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libatomic.OTHER.nb_OTHER"
+            "Name": "tcwg_bootstrap_check.libstdc++.OTHER.nb_OTHER"
         }
 	   ,
         {
@@ -475,39 +475,39 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libatomic.KFAIL.nb_KFAIL"
+            "Name": "tcwg_bootstrap_check.libstdc++.KFAIL.nb_KFAIL"
         }
 	   ,
         {
             "Data": [
-                0
+                131
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libatomic.XFAIL.nb_XFAIL"
+            "Name": "tcwg_bootstrap_check.libstdc++.XFAIL.nb_XFAIL"
         }
 	   ,
         {
             "Data": [
-                54
+                19453
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libatomic.PASS.nb_PASS"
+            "Name": "tcwg_bootstrap_check.libstdc++.PASS.nb_PASS"
         }
 	   ,
         {
             "Data": [
-                0
+                780
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libatomic.UNSUPPORTED.nb_UNSUPPORTED"
+            "Name": "tcwg_bootstrap_check.libstdc++.UNSUPPORTED.nb_UNSUPPORTED"
         }
 	   ,
         {
             "Data": [
-                54
+                20364
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libatomic.good.nb_good"
+            "Name": "tcwg_bootstrap_check.libstdc++.good.nb_good"
         }
 	   ,
         {
@@ -515,23 +515,23 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libatomic.bad.nb_bad"
+            "Name": "tcwg_bootstrap_check.libstdc++.bad.nb_bad"
         }
 	   ,
         {
             "Data": [
-                42
+                1
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gcc.FAIL.nb_FAIL"
+            "Name": "tcwg_bootstrap_check.libgomp.FAIL.nb_FAIL"
         }
 	   ,
         {
             "Data": [
-                0
+                1
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gcc.UNRESOLVED.nb_UNRESOLVED"
+            "Name": "tcwg_bootstrap_check.libgomp.UNRESOLVED.nb_UNRESOLVED"
         }
 	   ,
         {
@@ -539,7 +539,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gcc.UNTESTED.nb_UNTESTED"
+            "Name": "tcwg_bootstrap_check.libgomp.UNTESTED.nb_UNTESTED"
         }
 	   ,
         {
@@ -547,15 +547,15 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gcc.ERROR.nb_ERROR"
+            "Name": "tcwg_bootstrap_check.libgomp.ERROR.nb_ERROR"
         }
 	   ,
         {
             "Data": [
-                5
+                0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gcc.XPASS.nb_XPASS"
+            "Name": "tcwg_bootstrap_check.libgomp.XPASS.nb_XPASS"
         }
 	   ,
         {
@@ -563,7 +563,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gcc.OTHER.nb_OTHER"
+            "Name": "tcwg_bootstrap_check.libgomp.OTHER.nb_OTHER"
         }
 	   ,
         {
@@ -571,47 +571,47 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gcc.KFAIL.nb_KFAIL"
+            "Name": "tcwg_bootstrap_check.libgomp.KFAIL.nb_KFAIL"
         }
 	   ,
         {
             "Data": [
-                1980
+                284
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gcc.XFAIL.nb_XFAIL"
+            "Name": "tcwg_bootstrap_check.libgomp.XFAIL.nb_XFAIL"
         }
 	   ,
         {
             "Data": [
-                386600
+                17132
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gcc.PASS.nb_PASS"
+            "Name": "tcwg_bootstrap_check.libgomp.PASS.nb_PASS"
         }
 	   ,
         {
             "Data": [
-                5704
+                728
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gcc.UNSUPPORTED.nb_UNSUPPORTED"
+            "Name": "tcwg_bootstrap_check.libgomp.UNSUPPORTED.nb_UNSUPPORTED"
         }
 	   ,
         {
             "Data": [
-                394284
+                18144
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gcc.good.nb_good"
+            "Name": "tcwg_bootstrap_check.libgomp.good.nb_good"
         }
 	   ,
         {
             "Data": [
-                47
+                2
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gcc.bad.nb_bad"
+            "Name": "tcwg_bootstrap_check.libgomp.bad.nb_bad"
         }
 	   ,
         {
@@ -619,7 +619,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.objc.FAIL.nb_FAIL"
+            "Name": "tcwg_bootstrap_check.libatomic.FAIL.nb_FAIL"
         }
 	   ,
         {
@@ -627,7 +627,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.objc.UNRESOLVED.nb_UNRESOLVED"
+            "Name": "tcwg_bootstrap_check.libatomic.UNRESOLVED.nb_UNRESOLVED"
         }
 	   ,
         {
@@ -635,7 +635,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.objc.UNTESTED.nb_UNTESTED"
+            "Name": "tcwg_bootstrap_check.libatomic.UNTESTED.nb_UNTESTED"
         }
 	   ,
         {
@@ -643,7 +643,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.objc.ERROR.nb_ERROR"
+            "Name": "tcwg_bootstrap_check.libatomic.ERROR.nb_ERROR"
         }
 	   ,
         {
@@ -651,7 +651,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.objc.XPASS.nb_XPASS"
+            "Name": "tcwg_bootstrap_check.libatomic.XPASS.nb_XPASS"
         }
 	   ,
         {
@@ -659,7 +659,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.objc.OTHER.nb_OTHER"
+            "Name": "tcwg_bootstrap_check.libatomic.OTHER.nb_OTHER"
         }
 	   ,
         {
@@ -667,7 +667,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.objc.KFAIL.nb_KFAIL"
+            "Name": "tcwg_bootstrap_check.libatomic.KFAIL.nb_KFAIL"
         }
 	   ,
         {
@@ -675,31 +675,31 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.objc.XFAIL.nb_XFAIL"
+            "Name": "tcwg_bootstrap_check.libatomic.XFAIL.nb_XFAIL"
         }
 	   ,
         {
             "Data": [
-                2849
+                54
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.objc.PASS.nb_PASS"
+            "Name": "tcwg_bootstrap_check.libatomic.PASS.nb_PASS"
         }
 	   ,
         {
             "Data": [
-                70
+                0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.objc.UNSUPPORTED.nb_UNSUPPORTED"
+            "Name": "tcwg_bootstrap_check.libatomic.UNSUPPORTED.nb_UNSUPPORTED"
         }
 	   ,
         {
             "Data": [
-                2919
+                54
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.objc.good.nb_good"
+            "Name": "tcwg_bootstrap_check.libatomic.good.nb_good"
         }
 	   ,
         {
@@ -707,7 +707,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.objc.bad.nb_bad"
+            "Name": "tcwg_bootstrap_check.libatomic.bad.nb_bad"
         }
 	   ,
         {
@@ -715,7 +715,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libitm.FAIL.nb_FAIL"
+            "Name": "tcwg_bootstrap_check.objc.FAIL.nb_FAIL"
         }
 	   ,
         {
@@ -723,7 +723,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libitm.UNRESOLVED.nb_UNRESOLVED"
+            "Name": "tcwg_bootstrap_check.objc.UNRESOLVED.nb_UNRESOLVED"
         }
 	   ,
         {
@@ -731,7 +731,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libitm.UNTESTED.nb_UNTESTED"
+            "Name": "tcwg_bootstrap_check.objc.UNTESTED.nb_UNTESTED"
         }
 	   ,
         {
@@ -739,7 +739,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libitm.ERROR.nb_ERROR"
+            "Name": "tcwg_bootstrap_check.objc.ERROR.nb_ERROR"
         }
 	   ,
         {
@@ -747,7 +747,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libitm.XPASS.nb_XPASS"
+            "Name": "tcwg_bootstrap_check.objc.XPASS.nb_XPASS"
         }
 	   ,
         {
@@ -755,7 +755,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libitm.OTHER.nb_OTHER"
+            "Name": "tcwg_bootstrap_check.objc.OTHER.nb_OTHER"
         }
 	   ,
         {
@@ -763,39 +763,39 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libitm.KFAIL.nb_KFAIL"
+            "Name": "tcwg_bootstrap_check.objc.KFAIL.nb_KFAIL"
         }
 	   ,
         {
             "Data": [
-                3
+                0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libitm.XFAIL.nb_XFAIL"
+            "Name": "tcwg_bootstrap_check.objc.XFAIL.nb_XFAIL"
         }
 	   ,
         {
             "Data": [
-                44
+                2849
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libitm.PASS.nb_PASS"
+            "Name": "tcwg_bootstrap_check.objc.PASS.nb_PASS"
         }
 	   ,
         {
             "Data": [
-                1
+                70
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libitm.UNSUPPORTED.nb_UNSUPPORTED"
+            "Name": "tcwg_bootstrap_check.objc.UNSUPPORTED.nb_UNSUPPORTED"
         }
 	   ,
         {
             "Data": [
-                48
+                2919
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libitm.good.nb_good"
+            "Name": "tcwg_bootstrap_check.objc.good.nb_good"
         }
 	   ,
         {
@@ -803,7 +803,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libitm.bad.nb_bad"
+            "Name": "tcwg_bootstrap_check.objc.bad.nb_bad"
         }
 	   ,
         {
diff --git a/notify/mail-body.txt b/notify/mail-body.txt
index cf40bb13..b2e89f95 100644
--- a/notify/mail-body.txt
+++ b/notify/mail-body.txt
@@ -4,11 +4,11 @@ Our automatic CI has detected problems related to your patch(es). Please find so
 
 In bootstrap_check master-aarch64-check_bootstrap, after:
   | 9 commits in gcc
-  | 49f421a31f63 c++: constinit diagnostic regression [PR120506]
-  | 7037c72a8bb4 c++, coroutines: Some cleanups in build_actor.
-  | 0ae77a05c416 c++: Emit an error for attempted constexpr co_await [PR118903].
-  | 09cac2a83368 c++: Add co_await, co_yield and co_return to dump_expr.
-  | 0ec5306492be libstdc++: Remove spaces before function parameter list
+  | 49f421a31f6 c++: constinit diagnostic regression [PR120506]
+  | 7037c72a8bb c++, coroutines: Some cleanups in build_actor.
+  | 0ae77a05c41 c++: Emit an error for attempted constexpr co_await [PR118903].
+  | 09cac2a8336 c++: Add co_await, co_yield and co_return to dump_expr.
+  | 0ec5306492b libstdc++: Remove spaces before function parameter list
   | ... and 4 more commits in gcc
 
 Produces 2 regressions:
@@ -28,8 +28,8 @@ If you have any questions regarding this report, please ask on linaro-toolchain@
 
 The information below contains the details of the failures, and the ways to reproduce a debug environment:
 
-You can find the failure logs in *.log.1.xz files in
- * https://ci.linaro.org/job/tcwg_bootstrap_check--master-aarch64-check_bootstrap-build/1186/artifact/artifacts/00-sumfiles/
+You can find the failure logs in
+ * https://ci.linaro.org/job/tcwg_bootstrap_check--master-aarch64-check_bootstrap-build/1186/artifact/artifacts/
 The full lists of regressions and improvements as well as configure and make commands are in
  * https://ci.linaro.org/job/tcwg_bootstrap_check--master-aarch64-check_bootstrap-build/1186/artifact/artifacts/notify/
 The list of [ignored] baseline and flaky failures are in
diff --git a/notify/results.compare.txt b/notify/results.compare.txt
index 32e85172..81301f89 100644
--- a/notify/results.compare.txt
+++ b/notify/results.compare.txt
@@ -1,6 +1,6 @@
 # Comparing directories
 # REFERENCE: base-artifacts/sumfiles
-# CURRENT:   artifacts/sumfiles
+# CURRENT:   artifacts/99-rewrite/artifacts.old/sumfiles
 
 # Comparing 8 common sum files:
 g++.sum
@@ -12,8 +12,8 @@ libitm.sum
 libstdc++.sum
 objc.sum
 Comparing:
-REFERENCE:/tmp/gxx-sum1.2891057
-CURRENT:  /tmp/gxx-sum2.2891057
+REFERENCE:/tmp/gxx-sum1.616924
+CURRENT:  /tmp/gxx-sum2.616924
 
                                              +---------+---------+
 o  RUN STATUS:                               |   REF   |   RES   |
