diff --git a/notify/configure-toolchain.txt b/notify/configure-toolchain.txt
index 9cb4dbe6..ccf8155a 100644
--- a/notify/configure-toolchain.txt
+++ b/notify/configure-toolchain.txt
@@ -3,16 +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_4/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2 && /bin/bash /home/tcwg-buildslave/workspace/tcwg_gnu_4/abe/snapshots/gcc.git~master/configure SHELL=/bin/bash  --with-mpc=/home/tcwg-buildslave/workspace/tcwg_gnu_4/abe/builds/destdir/aarch64-unknown-linux-gnu --with-mpfr=/home/tcwg-buildslave/workspace/tcwg_gnu_4/abe/builds/destdir/aarch64-unknown-linux-gnu --with-gmp=/home/tcwg-buildslave/workspace/tcwg_gnu_4/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_4/abe/builds/destdir/aarch64-unknown-linux-gnu )
-make SHELL=/bin/bash -w -C /home/tcwg-buildslave/workspace/tcwg_gnu_4/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_4/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_4/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_4/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_4/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/dejagnu-dejagnu.git~linaro-local~stable && /bin/bash /home/tcwg-buildslave/workspace/tcwg_gnu_4/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_4/abe/builds/hosttools/aarch64-unknown-linux-gnu)
-make SHELL=/bin/bash -w -C /home/tcwg-buildslave/workspace/tcwg_gnu_4/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_4/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_4/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_4/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_4/abe/builds/destdir/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-" QEMU_WRAPPER=/home/tcwg-buildslave/workspace/tcwg_gnu_4/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_4/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2/ >> /home/tcwg-buildslave/workspace/tcwg_gnu_4/abe/builds/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/gcc-gcc.git~master-stage2/check-gcc.log 2>&1
-
diff --git a/notify/jira/GNU-1594-comment.txt b/notify/jira/GNU-1594-comment.txt
index 1379f6e3..b99afe5a 100644
--- a/notify/jira/GNU-1594-comment.txt
+++ b/notify/jira/GNU-1594-comment.txt
@@ -1 +1 @@
-Still failing : https://ci.linaro.org/job/tcwg_bootstrap_check--master-aarch64-check_bootstrap-build/1194/
+Fixed in : https://ci.linaro.org/job/tcwg_bootstrap_check--master-aarch64-check_bootstrap-build/1194/
diff --git a/notify/lnt_report.json b/notify/lnt_report.json
index 4d39d1f1..e1a987a2 100644
--- a/notify/lnt_report.json
+++ b/notify/lnt_report.json
@@ -139,7 +139,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libgomp.FAIL.nb_FAIL"
+            "Name": "tcwg_bootstrap_check.libitm.FAIL.nb_FAIL"
         }
 	   ,
         {
@@ -147,7 +147,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libgomp.UNRESOLVED.nb_UNRESOLVED"
+            "Name": "tcwg_bootstrap_check.libitm.UNRESOLVED.nb_UNRESOLVED"
         }
 	   ,
         {
@@ -155,7 +155,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libgomp.UNTESTED.nb_UNTESTED"
+            "Name": "tcwg_bootstrap_check.libitm.UNTESTED.nb_UNTESTED"
         }
 	   ,
         {
@@ -163,7 +163,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libgomp.ERROR.nb_ERROR"
+            "Name": "tcwg_bootstrap_check.libitm.ERROR.nb_ERROR"
         }
 	   ,
         {
@@ -171,7 +171,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libgomp.XPASS.nb_XPASS"
+            "Name": "tcwg_bootstrap_check.libitm.XPASS.nb_XPASS"
         }
 	   ,
         {
@@ -179,7 +179,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libgomp.OTHER.nb_OTHER"
+            "Name": "tcwg_bootstrap_check.libitm.OTHER.nb_OTHER"
         }
 	   ,
         {
@@ -187,39 +187,39 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libgomp.KFAIL.nb_KFAIL"
+            "Name": "tcwg_bootstrap_check.libitm.KFAIL.nb_KFAIL"
         }
 	   ,
         {
             "Data": [
-                284
+                3
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libgomp.XFAIL.nb_XFAIL"
+            "Name": "tcwg_bootstrap_check.libitm.XFAIL.nb_XFAIL"
         }
 	   ,
         {
             "Data": [
-                17134
+                44
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libgomp.PASS.nb_PASS"
+            "Name": "tcwg_bootstrap_check.libitm.PASS.nb_PASS"
         }
 	   ,
         {
             "Data": [
-                728
+                1
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libgomp.UNSUPPORTED.nb_UNSUPPORTED"
+            "Name": "tcwg_bootstrap_check.libitm.UNSUPPORTED.nb_UNSUPPORTED"
         }
 	   ,
         {
             "Data": [
-                18146
+                48
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libgomp.good.nb_good"
+            "Name": "tcwg_bootstrap_check.libitm.good.nb_good"
         }
 	   ,
         {
@@ -227,15 +227,15 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libgomp.bad.nb_bad"
+            "Name": "tcwg_bootstrap_check.libitm.bad.nb_bad"
         }
 	   ,
         {
             "Data": [
-                0
+                12
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libitm.FAIL.nb_FAIL"
+            "Name": "tcwg_bootstrap_check.g++.FAIL.nb_FAIL"
         }
 	   ,
         {
@@ -243,7 +243,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libitm.UNRESOLVED.nb_UNRESOLVED"
+            "Name": "tcwg_bootstrap_check.g++.UNRESOLVED.nb_UNRESOLVED"
         }
 	   ,
         {
@@ -251,7 +251,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libitm.UNTESTED.nb_UNTESTED"
+            "Name": "tcwg_bootstrap_check.g++.UNTESTED.nb_UNTESTED"
         }
 	   ,
         {
@@ -259,15 +259,15 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libitm.ERROR.nb_ERROR"
+            "Name": "tcwg_bootstrap_check.g++.ERROR.nb_ERROR"
         }
 	   ,
         {
             "Data": [
-                0
+                3
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libitm.XPASS.nb_XPASS"
+            "Name": "tcwg_bootstrap_check.g++.XPASS.nb_XPASS"
         }
 	   ,
         {
@@ -275,7 +275,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libitm.OTHER.nb_OTHER"
+            "Name": "tcwg_bootstrap_check.g++.OTHER.nb_OTHER"
         }
 	   ,
         {
@@ -283,55 +283,55 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libitm.KFAIL.nb_KFAIL"
+            "Name": "tcwg_bootstrap_check.g++.KFAIL.nb_KFAIL"
         }
 	   ,
         {
             "Data": [
-                3
+                2608
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libitm.XFAIL.nb_XFAIL"
+            "Name": "tcwg_bootstrap_check.g++.XFAIL.nb_XFAIL"
         }
 	   ,
         {
             "Data": [
-                44
+                434342
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libitm.PASS.nb_PASS"
+            "Name": "tcwg_bootstrap_check.g++.PASS.nb_PASS"
         }
 	   ,
         {
             "Data": [
-                1
+                3484
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libitm.UNSUPPORTED.nb_UNSUPPORTED"
+            "Name": "tcwg_bootstrap_check.g++.UNSUPPORTED.nb_UNSUPPORTED"
         }
 	   ,
         {
             "Data": [
-                48
+                440434
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libitm.good.nb_good"
+            "Name": "tcwg_bootstrap_check.g++.good.nb_good"
         }
 	   ,
         {
             "Data": [
-                0
+                15
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libitm.bad.nb_bad"
+            "Name": "tcwg_bootstrap_check.g++.bad.nb_bad"
         }
 	   ,
         {
             "Data": [
-                0
+                2
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.objc.FAIL.nb_FAIL"
+            "Name": "tcwg_bootstrap_check.gfortran.FAIL.nb_FAIL"
         }
 	   ,
         {
@@ -339,7 +339,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.objc.UNRESOLVED.nb_UNRESOLVED"
+            "Name": "tcwg_bootstrap_check.gfortran.UNRESOLVED.nb_UNRESOLVED"
         }
 	   ,
         {
@@ -347,7 +347,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.objc.UNTESTED.nb_UNTESTED"
+            "Name": "tcwg_bootstrap_check.gfortran.UNTESTED.nb_UNTESTED"
         }
 	   ,
         {
@@ -355,7 +355,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.objc.ERROR.nb_ERROR"
+            "Name": "tcwg_bootstrap_check.gfortran.ERROR.nb_ERROR"
         }
 	   ,
         {
@@ -363,7 +363,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.objc.XPASS.nb_XPASS"
+            "Name": "tcwg_bootstrap_check.gfortran.XPASS.nb_XPASS"
         }
 	   ,
         {
@@ -371,7 +371,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.objc.OTHER.nb_OTHER"
+            "Name": "tcwg_bootstrap_check.gfortran.OTHER.nb_OTHER"
         }
 	   ,
         {
@@ -379,55 +379,55 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.objc.KFAIL.nb_KFAIL"
+            "Name": "tcwg_bootstrap_check.gfortran.KFAIL.nb_KFAIL"
         }
 	   ,
         {
             "Data": [
-                0
+                333
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.objc.XFAIL.nb_XFAIL"
+            "Name": "tcwg_bootstrap_check.gfortran.XFAIL.nb_XFAIL"
         }
 	   ,
         {
             "Data": [
-                2849
+                72578
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.objc.PASS.nb_PASS"
+            "Name": "tcwg_bootstrap_check.gfortran.PASS.nb_PASS"
         }
 	   ,
         {
             "Data": [
-                70
+                171
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.objc.UNSUPPORTED.nb_UNSUPPORTED"
+            "Name": "tcwg_bootstrap_check.gfortran.UNSUPPORTED.nb_UNSUPPORTED"
         }
 	   ,
         {
             "Data": [
-                2919
+                73082
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.objc.good.nb_good"
+            "Name": "tcwg_bootstrap_check.gfortran.good.nb_good"
         }
 	   ,
         {
             "Data": [
-                0
+                2
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.objc.bad.nb_bad"
+            "Name": "tcwg_bootstrap_check.gfortran.bad.nb_bad"
         }
 	   ,
         {
             "Data": [
-                2
+                0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gfortran.FAIL.nb_FAIL"
+            "Name": "tcwg_bootstrap_check.libstdc++.FAIL.nb_FAIL"
         }
 	   ,
         {
@@ -435,7 +435,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gfortran.UNRESOLVED.nb_UNRESOLVED"
+            "Name": "tcwg_bootstrap_check.libstdc++.UNRESOLVED.nb_UNRESOLVED"
         }
 	   ,
         {
@@ -443,7 +443,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gfortran.UNTESTED.nb_UNTESTED"
+            "Name": "tcwg_bootstrap_check.libstdc++.UNTESTED.nb_UNTESTED"
         }
 	   ,
         {
@@ -451,7 +451,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gfortran.ERROR.nb_ERROR"
+            "Name": "tcwg_bootstrap_check.libstdc++.ERROR.nb_ERROR"
         }
 	   ,
         {
@@ -459,7 +459,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gfortran.XPASS.nb_XPASS"
+            "Name": "tcwg_bootstrap_check.libstdc++.XPASS.nb_XPASS"
         }
 	   ,
         {
@@ -467,7 +467,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gfortran.OTHER.nb_OTHER"
+            "Name": "tcwg_bootstrap_check.libstdc++.OTHER.nb_OTHER"
         }
 	   ,
         {
@@ -475,47 +475,47 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gfortran.KFAIL.nb_KFAIL"
+            "Name": "tcwg_bootstrap_check.libstdc++.KFAIL.nb_KFAIL"
         }
 	   ,
         {
             "Data": [
-                333
+                131
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gfortran.XFAIL.nb_XFAIL"
+            "Name": "tcwg_bootstrap_check.libstdc++.XFAIL.nb_XFAIL"
         }
 	   ,
         {
             "Data": [
-                72578
+                19477
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gfortran.PASS.nb_PASS"
+            "Name": "tcwg_bootstrap_check.libstdc++.PASS.nb_PASS"
         }
 	   ,
         {
             "Data": [
-                171
+                780
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gfortran.UNSUPPORTED.nb_UNSUPPORTED"
+            "Name": "tcwg_bootstrap_check.libstdc++.UNSUPPORTED.nb_UNSUPPORTED"
         }
 	   ,
         {
             "Data": [
-                73082
+                20388
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gfortran.good.nb_good"
+            "Name": "tcwg_bootstrap_check.libstdc++.good.nb_good"
         }
 	   ,
         {
             "Data": [
-                2
+                0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.gfortran.bad.nb_bad"
+            "Name": "tcwg_bootstrap_check.libstdc++.bad.nb_bad"
         }
 	   ,
         {
@@ -523,7 +523,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libstdc++.FAIL.nb_FAIL"
+            "Name": "tcwg_bootstrap_check.libgomp.FAIL.nb_FAIL"
         }
 	   ,
         {
@@ -531,7 +531,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libstdc++.UNRESOLVED.nb_UNRESOLVED"
+            "Name": "tcwg_bootstrap_check.libgomp.UNRESOLVED.nb_UNRESOLVED"
         }
 	   ,
         {
@@ -539,7 +539,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libstdc++.UNTESTED.nb_UNTESTED"
+            "Name": "tcwg_bootstrap_check.libgomp.UNTESTED.nb_UNTESTED"
         }
 	   ,
         {
@@ -547,7 +547,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libstdc++.ERROR.nb_ERROR"
+            "Name": "tcwg_bootstrap_check.libgomp.ERROR.nb_ERROR"
         }
 	   ,
         {
@@ -555,7 +555,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libstdc++.XPASS.nb_XPASS"
+            "Name": "tcwg_bootstrap_check.libgomp.XPASS.nb_XPASS"
         }
 	   ,
         {
@@ -563,7 +563,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libstdc++.OTHER.nb_OTHER"
+            "Name": "tcwg_bootstrap_check.libgomp.OTHER.nb_OTHER"
         }
 	   ,
         {
@@ -571,39 +571,39 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libstdc++.KFAIL.nb_KFAIL"
+            "Name": "tcwg_bootstrap_check.libgomp.KFAIL.nb_KFAIL"
         }
 	   ,
         {
             "Data": [
-                131
+                284
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libstdc++.XFAIL.nb_XFAIL"
+            "Name": "tcwg_bootstrap_check.libgomp.XFAIL.nb_XFAIL"
         }
 	   ,
         {
             "Data": [
-                19477
+                17134
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libstdc++.PASS.nb_PASS"
+            "Name": "tcwg_bootstrap_check.libgomp.PASS.nb_PASS"
         }
 	   ,
         {
             "Data": [
-                780
+                728
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libstdc++.UNSUPPORTED.nb_UNSUPPORTED"
+            "Name": "tcwg_bootstrap_check.libgomp.UNSUPPORTED.nb_UNSUPPORTED"
         }
 	   ,
         {
             "Data": [
-                20388
+                18146
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libstdc++.good.nb_good"
+            "Name": "tcwg_bootstrap_check.libgomp.good.nb_good"
         }
 	   ,
         {
@@ -611,15 +611,15 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libstdc++.bad.nb_bad"
+            "Name": "tcwg_bootstrap_check.libgomp.bad.nb_bad"
         }
 	   ,
         {
             "Data": [
-                12
+                0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.g++.FAIL.nb_FAIL"
+            "Name": "tcwg_bootstrap_check.libatomic.FAIL.nb_FAIL"
         }
 	   ,
         {
@@ -627,7 +627,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.g++.UNRESOLVED.nb_UNRESOLVED"
+            "Name": "tcwg_bootstrap_check.libatomic.UNRESOLVED.nb_UNRESOLVED"
         }
 	   ,
         {
@@ -635,7 +635,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.g++.UNTESTED.nb_UNTESTED"
+            "Name": "tcwg_bootstrap_check.libatomic.UNTESTED.nb_UNTESTED"
         }
 	   ,
         {
@@ -643,15 +643,15 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.g++.ERROR.nb_ERROR"
+            "Name": "tcwg_bootstrap_check.libatomic.ERROR.nb_ERROR"
         }
 	   ,
         {
             "Data": [
-                3
+                0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.g++.XPASS.nb_XPASS"
+            "Name": "tcwg_bootstrap_check.libatomic.XPASS.nb_XPASS"
         }
 	   ,
         {
@@ -659,7 +659,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.g++.OTHER.nb_OTHER"
+            "Name": "tcwg_bootstrap_check.libatomic.OTHER.nb_OTHER"
         }
 	   ,
         {
@@ -667,47 +667,47 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.g++.KFAIL.nb_KFAIL"
+            "Name": "tcwg_bootstrap_check.libatomic.KFAIL.nb_KFAIL"
         }
 	   ,
         {
             "Data": [
-                2608
+                0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.g++.XFAIL.nb_XFAIL"
+            "Name": "tcwg_bootstrap_check.libatomic.XFAIL.nb_XFAIL"
         }
 	   ,
         {
             "Data": [
-                434342
+                54
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.g++.PASS.nb_PASS"
+            "Name": "tcwg_bootstrap_check.libatomic.PASS.nb_PASS"
         }
 	   ,
         {
             "Data": [
-                3484
+                0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.g++.UNSUPPORTED.nb_UNSUPPORTED"
+            "Name": "tcwg_bootstrap_check.libatomic.UNSUPPORTED.nb_UNSUPPORTED"
         }
 	   ,
         {
             "Data": [
-                440434
+                54
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.g++.good.nb_good"
+            "Name": "tcwg_bootstrap_check.libatomic.good.nb_good"
         }
 	   ,
         {
             "Data": [
-                15
+                0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.g++.bad.nb_bad"
+            "Name": "tcwg_bootstrap_check.libatomic.bad.nb_bad"
         }
 	   ,
         {
@@ -715,7 +715,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libatomic.FAIL.nb_FAIL"
+            "Name": "tcwg_bootstrap_check.objc.FAIL.nb_FAIL"
         }
 	   ,
         {
@@ -723,7 +723,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libatomic.UNRESOLVED.nb_UNRESOLVED"
+            "Name": "tcwg_bootstrap_check.objc.UNRESOLVED.nb_UNRESOLVED"
         }
 	   ,
         {
@@ -731,7 +731,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libatomic.UNTESTED.nb_UNTESTED"
+            "Name": "tcwg_bootstrap_check.objc.UNTESTED.nb_UNTESTED"
         }
 	   ,
         {
@@ -739,7 +739,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libatomic.ERROR.nb_ERROR"
+            "Name": "tcwg_bootstrap_check.objc.ERROR.nb_ERROR"
         }
 	   ,
         {
@@ -747,7 +747,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libatomic.XPASS.nb_XPASS"
+            "Name": "tcwg_bootstrap_check.objc.XPASS.nb_XPASS"
         }
 	   ,
         {
@@ -755,7 +755,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libatomic.OTHER.nb_OTHER"
+            "Name": "tcwg_bootstrap_check.objc.OTHER.nb_OTHER"
         }
 	   ,
         {
@@ -763,7 +763,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libatomic.KFAIL.nb_KFAIL"
+            "Name": "tcwg_bootstrap_check.objc.KFAIL.nb_KFAIL"
         }
 	   ,
         {
@@ -771,31 +771,31 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libatomic.XFAIL.nb_XFAIL"
+            "Name": "tcwg_bootstrap_check.objc.XFAIL.nb_XFAIL"
         }
 	   ,
         {
             "Data": [
-                54
+                2849
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libatomic.PASS.nb_PASS"
+            "Name": "tcwg_bootstrap_check.objc.PASS.nb_PASS"
         }
 	   ,
         {
             "Data": [
-                0
+                70
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libatomic.UNSUPPORTED.nb_UNSUPPORTED"
+            "Name": "tcwg_bootstrap_check.objc.UNSUPPORTED.nb_UNSUPPORTED"
         }
 	   ,
         {
             "Data": [
-                54
+                2919
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libatomic.good.nb_good"
+            "Name": "tcwg_bootstrap_check.objc.good.nb_good"
         }
 	   ,
         {
@@ -803,7 +803,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_bootstrap_check.libatomic.bad.nb_bad"
+            "Name": "tcwg_bootstrap_check.objc.bad.nb_bad"
         }
 	   ,
         {
diff --git a/notify/mail-body.txt b/notify/mail-body.txt
index ab680a2b..fab622eb 100644
--- a/notify/mail-body.txt
+++ b/notify/mail-body.txt
@@ -22,8 +22,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/1194/artifact/artifacts/00-sumfiles/
+You can find the failure logs in
+ * https://ci.linaro.org/job/tcwg_bootstrap_check--master-aarch64-check_bootstrap-build/1194/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/1194/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 78010410..a735d467 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.2883312
-CURRENT:  /tmp/gxx-sum2.2883312
+REFERENCE:/tmp/gxx-sum1.700097
+CURRENT:  /tmp/gxx-sum2.700097
 
                                              +---------+---------+
 o  RUN STATUS:                               |   REF   |   RES   |
