GHA fixes

animetosho · May 16, 2024 · 1410d77 · 1410d77
1 parent 37186c1
commit 1410d77
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -346,8 +346,10 @@ jobs:
         with:
           target: x86_64-linux-muslx32
       - run: |
-          file $CC
-          $CC
+          file $CXX
+          ldd $CXX
+          readelf -h -l -S -V -A -I $CXX
+          $CXX
           
           mkdir test/gf16/build
           cmake -Btest/gf16/build -Stest/gf16 -DSTATIC_LINK=1 -DCMAKE_BUILD_TYPE=Release \
@@ -396,6 +398,10 @@ jobs:
         compiler:
           - {cc: 'gcc-12', cxx: 'g++-12'}
           - {cc: 'clang', cxx: 'clang++'}
+        exclude:
+          # arm_acle.h seems to be broken in Homebrew's GCC12? (type conflict between __builtin_aarch64_rndr and __rndr)
+          - os: macos-14
+            compiler: {cc: 'gcc-12', cxx: 'g++-12'}
     name: Test MacOS ${{ matrix.compiler.cc }} (${{ matrix.os }} ${{ matrix.config }})
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30

diff --git a/gf16/gf16mul.cpp b/gf16/gf16mul.cpp
@@ -203,7 +203,7 @@ struct GF16CpuCap {
 	bool hasSHA3;
 	bool hasSVE;
 	bool hasSVE2;
-	GF16CpuCap(bool detect) : hasNEON(true), hasSVE(true), hasSVE2(true) {
+	GF16CpuCap(bool detect) : hasNEON(true), hasSHA3(true), hasSVE(true), hasSVE2(true) {
 		if(!detect) return;
 		hasNEON = CPU_HAS_NEON;
 		hasSHA3 = CPU_HAS_NEON_SHA3;