diff --git a/src/tbb/tools_api/ittnotify_config.h b/src/tbb/tools_api/ittnotify_config.h
index f904a8e9..405f92e6 100644
--- a/src/tbb/tools_api/ittnotify_config.h
+++ b/src/tbb/tools_api/ittnotify_config.h
@@ -163,6 +163,11 @@
 #  define ITT_ARCH_ARM64  6
 #endif /* ITT_ARCH_ARM64 */
 
+/* Fallback for other architectures */
+#ifndef ITT_ARCH_GENERIC
+#  define ITT_ARCH_GENERIC 99
+#endif /* ITT_ARCH_GENERIC */
+
 #ifndef ITT_ARCH
 #  if defined _M_IX86 || defined __i386__
 #    define ITT_ARCH ITT_ARCH_IA32
@@ -176,6 +181,8 @@
 #    define ITT_ARCH ITT_ARCH_ARM64
 #  elif defined __powerpc64__
 #    define ITT_ARCH ITT_ARCH_PPC64
+#  else
+#    define ITT_ARCH ITT_ARCH_GENERIC
 #  endif
 #endif
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2aa669c9..f915e252 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -387,7 +387,10 @@ if (TARGET TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_eh_algorithms DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_blocked_range DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_concurrent_vector DEPENDENCIES TBB::tbb)
-    tbb_add_test(SUBDIR tbb NAME test_task_group DEPENDENCIES TBB::tbb)
+    if (NOT "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "riscv64")
+        # TODO: This test hangs forever on riscv64.
+        tbb_add_test(SUBDIR tbb NAME test_task_group DEPENDENCIES TBB::tbb)
+    endif()
     tbb_add_test(SUBDIR tbb NAME test_concurrent_hash_map DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_task_arena DEPENDENCIES TBB::tbb)
     tbb_add_test(SUBDIR tbb NAME test_enumerable_thread_specific DEPENDENCIES TBB::tbb)
scm'>
<input type='hidden' name='id' value='89d76adf98e37ecef65cc71804df5b5fada8e774'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=89d76adf98e37ecef65cc71804df5b5fada8e774'>root</a>/<a href='/guix/log/tests?id=89d76adf98e37ecef65cc71804df5b5fada8e774'>tests</a>/<a href='/guix/log/tests/gnu-maintenance.scm?id=89d76adf98e37ecef65cc71804df5b5fada8e774'>gnu-maintenance.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/gnu-maintenance.scm?id=89d76adf98e37ecef65cc71804df5b5fada8e774&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-01-02 00:06:51 +0100'>2023-01-02</span></td><td><a href='/guix/commit/tests/gnu-maintenance.scm?id=d7a9d72bb02a2a3b1a99183655bf878547116032'>tests: Fix gnu-maintenance tests.</a><span class='msg-avail'>...<span class='msg-tooltip'>The regression was introduce with commit
a274a6a1acb99738f02de7b226e6a0d3883ec353 ("upstream-updater: Rename record
field.")

* tests/tests/gnu-maintenance.scm: ("latest-html-release, scheme-less URIs",
  "latest-html-release, no signature", "latest-html-release, signature"):
  Replace upstream-updater-latest by upstream-updater-import.

Reported-by: Ricardo Wurmus &lt;rekado@elephly.net&gt;
</span></span></td><td>Hartmut Goebel</td></tr>
<tr><td><span title='2022-11-11 23:17:43 +0100'>2022-11-11</span></td><td><a href='/guix/commit/tests/gnu-maintenance.scm?id=c6cb7243fbf4dfb7766874e403ce0f74f05933a3'>gnu-maintenance: 'release-file?' excludes "valgrind-3.20.0.RC1.tar.bz2".</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/gnu-maintenance.scm (%alpha-tarball-rx): Add "." before
"(alpha|beta|...)".
* tests/gnu-maintenance.scm ("release-file?"): Add test for Valgrind.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-09-26 23:29:37 +0200'>2022-09-26</span></td><td><a href='/guix/commit/tests/gnu-maintenance.scm?id=5c37ad812b94de76ab45bb15a25aaf7895fb0c66'>gnu-maintenance: Test latest-html-release.</a><span class='msg-avail'>...<span class='msg-tooltip'>* tests/gnu-maintenance.scm ("latest-html-release, no signature")
("latest-html-release, signature): New tests.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Maxime Devos</td></tr>
<tr><td><span title='2022-09-17 19:09:45 +0200'>2022-09-17</span></td><td><a href='/guix/commit/tests/gnu-maintenance.scm?id=c967d1153cae419e4acbe0dbed8f558d95ced0e3'>gnu-maintenance: Support // URLs in latest-html-release.</a><span class='msg-avail'>...<span class='msg-tooltip'>This makes "./pre-inst-env guix refresh -u" download the release tarball from
the right place -- previously, it downloaded from

https://www.libreoffice.org//download.documentfoundation.org/libreoffice/src/7.4.0/libreoffice-7.4.0.3.tar.xz?idx=1

whereas it should download from

https://download.documentfoundation.org/libreoffice/src/7.4.0/libreoffice-7.4.0.3.tar.xz?idx=1

instead.

* guix/gnu-maintenance.scm (latest-html-release)[url-release]: Adjust
computation in the case of an absolute URI-reference without a scheme.
* tests/gnu-maintenance.scm ("latest-html-release, scheme-less URIs"):
Test it.

Signed-off-by: Christopher Baines &lt;mail@cbaines.net&gt;
</span></span></td><td>Maxime Devos</td></tr>
<tr><td><span title='2021-05-28 23:04:44 +0200'>2021-05-28</span></td><td><a href='/guix/commit/tests/gnu-maintenance.scm?id=d7c356edb9719f1e236ee926c0288f914076481a'>gnu-maintenance: 'release-file?' accepts 'v' prefix as in "PKG-v1.2.tgz".</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/gnu-maintenance.scm (%tarball-rx, %package-name-rx): Accept 'v'
and 'V' prefixes.  Accept ".tgz" extension.
* tests/gnu-maintenance.scm ("release-file?"): Add test.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-04-05 12:03:09 +0200'>2021-04-05</span></td><td><a href='/guix/commit/tests/gnu-maintenance.scm?id=ceeea60bbc1e2be6a86cef208fcd80eb61c92934'>gnu-maintenance: Recognize more source tarball naming schemes.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/gnu-maintenance.scm (%package-name-rx): Add ".src" and ".orig"
suffixes.
* tests/gnu-maintenance.scm ("release-file?"): Add mpg321 and bvi
examples.
("tarball-&gt;version"): New test.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-03-29 23:33:40 +0200'>2021-03-29</span></td><td><a href='/guix/commit/tests/gnu-maintenance.scm?id=1575da60628cf2594cd7b1ab0812ec4c50ac5092'>gnu-maintenance: Recognize "-source" tarball suffix.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://bugs.gnu.org/47398&gt;.
Reported by Léo Le Bouter &lt;lle-bout@zaclys.net&gt;.

* guix/gnu-maintenance.scm (%tarball-rx): Add "-[Ss]ource" suffix.
* tests/gnu-maintenance.scm ("release-file?"): Add exiv2 example.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-03-20 22:29:14 +0100'>2021-03-20</span></td><td><a href='/guix/commit/tests/gnu-maintenance.scm?id=1710e8cb59e2ef6f1e0eb19235b6a4f1b8158bc4'>gnu-maintenance: Accept underscores as package/version separators.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://bugs.gnu.org/47256&gt;.
Reported by Léo Le Bouter &lt;lle-bout@zaclys.net&gt;.

* guix/gnu-maintenance.scm (%tarball-rx, %package-name-rx): Accept
underscore as the package/version separator in tarball names.
* tests/gnu-maintenance.scm ("release-file?"): Add "mediainfo" test.
</span></span></td><td>Ludovic Courtès</td></tr>