fixup! Merge tag 'VALGRIND_3_25_1'

Author: art049

.github/workflows/ci.yml

@@ -52,7 +52,7 @@ jobs:
       - name: Build test dependencies
         run: |
           make -C tests arch_test os_test true
-          make -C memcheck/tests bug445235_ada_demangle
+          make -C callgrind/tests check
 
       - name: Run Callgrind tests
         run: |

configure.ac

@@ -302,18 +302,12 @@ case "${host_cpu}" in
         ARCH_MAX="nanomips"
         ;;
 
-<<<<<<< HEAD
-     *)
-||||||| fcdaa4742
-     *)
-=======
      riscv64)
        AC_MSG_RESULT([ok (${host_cpu})])
        ARCH_MAX="riscv64"
        ;;
 
      *)
->>>>>>> VALGRIND_3_25_1
 	AC_MSG_RESULT([no (${host_cpu})])
 	AC_MSG_ERROR([Unsupported host architecture. Sorry])
 	;;