Skip to content

Commit 01ebc2c

Browse files
committed
Add -moutline-atomics to ARM64 builds to fix SIGILL on ARMv8.0 CPUs
1 parent 515344b commit 01ebc2c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.github/workflows/build-reusable.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ jobs:
217217
run: |
218218
rm -rf ${{runner.temp}}/bun-webkit ${{runner.temp}}/bun-webkit.tar.gz
219219
if [ "${{matrix.package_json_arch}}" = "arm64" ]; then
220-
export MARCH_FLAG="-march=armv8-a+crc -mtune=ampere1"
220+
export MARCH_FLAG="-march=armv8-a+crc -mtune=ampere1 -moutline-atomics"
221221
elif [ "${{matrix.package_json_arch}}" = "x64" ]; then
222222
export MARCH_FLAG="-march=nehalem"
223223
fi
@@ -372,7 +372,7 @@ jobs:
372372
run: |
373373
rm -rf ${{runner.temp}}/bun-webkit ${{runner.temp}}/bun-webkit.tar.gz
374374
if [ "${{matrix.package_json_arch}}" = "arm64" ]; then
375-
export MARCH_FLAG="-march=armv8-a+crc -mtune=ampere1"
375+
export MARCH_FLAG="-march=armv8-a+crc -mtune=ampere1 -moutline-atomics"
376376
elif [ "${{matrix.package_json_arch}}" = "x64" ]; then
377377
export MARCH_FLAG="-march=nehalem"
378378
fi

musl-release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export WEBKIT_RELEASE_TYPE=${WEBKIT_RELEASE_TYPE:-"Release"}
3737
# Set default MARCH_FLAG based on architecture if not already set
3838
if [ -z "${MARCH_FLAG:-}" ]; then
3939
if [ "$BUILDKIT_ARCH" == "arm64" ]; then
40-
export MARCH_FLAG="-march=armv8-a+crc -mtune=ampere1"
40+
export MARCH_FLAG="-march=armv8-a+crc -mtune=ampere1 -moutline-atomics"
4141
elif [ "$BUILDKIT_ARCH" == "amd64" ]; then
4242
export MARCH_FLAG="-march=nehalem"
4343
fi

release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export WEBKIT_RELEASE_TYPE=${WEBKIT_RELEASE_TYPE:-"Release"}
3737
# Set default MARCH_FLAG based on architecture if not already set
3838
if [ -z "${MARCH_FLAG:-}" ]; then
3939
if [ "$BUILDKIT_ARCH" == "arm64" ]; then
40-
export MARCH_FLAG="-march=armv8-a+crc -mtune=ampere1"
40+
export MARCH_FLAG="-march=armv8-a+crc -mtune=ampere1 -moutline-atomics"
4141
elif [ "$BUILDKIT_ARCH" == "amd64" ]; then
4242
export MARCH_FLAG="-march=nehalem"
4343
fi

0 commit comments

Comments
 (0)