DO NOT MERGE: CI test

Author: ebiggers

.github/workflows/ci.yml

@@ -27,16 +27,16 @@ jobs:
     strategy:
       matrix:
         include:
-        - { arch: armv6, distro: bullseye, compiler: gcc }
-        - { arch: armv6, distro: bullseye, compiler: clang }
-        - { arch: armv7, distro: bullseye, compiler: gcc }
-        - { arch: armv7, distro: bullseye, compiler: clang }
-        - { arch: aarch64, distro: bullseye, compiler: gcc }
-        - { arch: aarch64, distro: bullseye, compiler: clang }
-        - { arch: s390x, distro: bullseye, compiler: gcc }
-        - { arch: s390x, distro: bullseye, compiler: clang }
-        - { arch: ppc64le, distro: bullseye, compiler: gcc }
-        - { arch: ppc64le, distro: bullseye, compiler: clang }
+        - { arch: armv6, distro: bookworm, compiler: gcc }
+        - { arch: armv6, distro: bookworm, compiler: clang }
+        - { arch: armv7, distro: bookworm, compiler: gcc }
+        - { arch: armv7, distro: bookworm, compiler: clang }
+        - { arch: aarch64, distro: bookworm, compiler: gcc }
+        - { arch: aarch64, distro: bookworm, compiler: clang }
+        - { arch: s390x, distro: bookworm, compiler: gcc }
+        - { arch: s390x, distro: bookworm, compiler: clang }
+        - { arch: ppc64le, distro: bookworm, compiler: gcc }
+        - { arch: ppc64le, distro: bookworm, compiler: clang }
         - { arch: riscv64, distro: ubuntu_latest, compiler: gcc }
         - { arch: riscv64, distro: ubuntu_latest, compiler: clang }
     runs-on: ubuntu-latest

common_defs.h

@@ -66,6 +66,7 @@
 #undef ARCH_ARM64
 #undef ARCH_ARM32
 #undef ARCH_RISCV
+#if 0
 #ifdef _MSC_VER
    /* Way too many things are broken in ARM64EC to pretend that it is x86_64. */
 #  if defined(_M_X64) && !defined(_M_ARM64EC)
@@ -90,6 +91,7 @@
 #    define ARCH_RISCV
 #  endif
 #endif
+#endif
 
 /* ========================================================================== */
 /*                              Type definitions                              */