MDEV-26109: s390x detected as 32bit in mtr tests

Currently @@version_compile_machine is used by mtr
to determine if the compiled executable is 32 or 64
bits.

We extend that logic by ensuring that if the DEFAUT_MACHINE
name doesn't have "64" in its string, "-64bits" is appended
to ensure these test pass.

cmake/package_name.cmake

@@ -110,7 +110,11 @@ IF(NOT VERSION)
         SET(DEFAULT_MACHINE "x86")
       ENDIF()
     ENDIF()
-
+
+    IF(NOT DEFAULT_MACHINE MATCHES "64" AND 64BIT)
+      SET(DEFAULT_MACHINE "${DEFAULT_MACHINE}-64bit")
+    ENDIF()
+
     IF(NOT PLATFORM)
       SET(PLATFORM ${DEFAULT_PLATFORM})
     ENDIF()