From 6b8725333a2ea95e148d0aaac89c47ee1898cf03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Sat, 5 Nov 2022 00:22:10 +0200
Subject: [PATCH] build-openmp: Build the OpenMP library on all architectures

Since a356782426f5bf54a00570e1f925345e5fda7b2e in llvm-project,
OpenMP can be built for mingw/aarch64, since
fb947c358661b3bd3d5e1fa776ec74cc0f308854 it should work correctly
in all currently tested cases, and since
97958c9bb83cec44b6ce13e732b53de0171a5d43 it can be built for
mingw/armv7.
---
 Dockerfile.dev  | 8 --------
 build-openmp.sh | 6 ------
 run-tests.sh    | 4 ++--
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/Dockerfile.dev b/Dockerfile.dev
index 789edea..d802748 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -163,16 +163,8 @@ RUN cd test && \
 COPY build-openmp.sh ./
 RUN ./build-openmp.sh $TOOLCHAIN_PREFIX $CFGUARD_ARGS
 
-# OpenMP on windows only supports x86.
 RUN cd test && \
     for arch in $TOOLCHAIN_ARCHS; do \
-        case $arch in \
-        i686|x86_64) \
-            ;; \
-        *) \
-            continue \
-            ;; \
-        esac && \
         for test in hello-omp; do \
             $arch-w64-mingw32-clang $test.c -o $arch/$test.exe -fopenmp=libomp || exit 1; \
         done; \
diff --git a/build-openmp.sh b/build-openmp.sh
index 26fabcd..b912a72 100755
--- a/build-openmp.sh
+++ b/build-openmp.sh
@@ -72,15 +72,9 @@ fi
 for arch in $ARCHS; do
     CMAKEFLAGS=""
     case $arch in
-    i686)
-        ;;
     x86_64)
         CMAKEFLAGS="$CMAKEFLAGS -DLIBOMP_ASMFLAGS=-m64"
         ;;
-    *)
-        # Not supported
-        continue
-        ;;
     esac
 
     [ -z "$CLEAN" ] || rm -rf build-$arch
diff --git a/run-tests.sh b/run-tests.sh
index 808a6bf..9b757e5 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -114,14 +114,14 @@ for arch in $ARCHS; do
         COPY="$COPY_ARMV7"
         NATIVE="$NATIVE_ARMV7"
         unset HAVE_SANITIZERS
-        unset HAVE_OPENMP
+        HAVE_OPENMP=1
         ;;
     aarch64)
         RUN="$RUN_AARCH64"
         COPY="$COPY_AARCH64"
         NATIVE="$NATIVE_AARCH64"
         unset HAVE_SANITIZERS
-        unset HAVE_OPENMP
+        HAVE_OPENMP=1
         ;;
     esac