Explicitly pass -march flags to WebKit

Author: Jarred-Sumner

.github/workflows/build-reusable.yml

@@ -216,6 +216,11 @@ jobs:
           ENABLE_SANITIZERS: ${{matrix.ENABLE_SANITIZERS}}
         run: |
           rm -rf ${{runner.temp}}/bun-webkit ${{runner.temp}}/bun-webkit.tar.gz
+          if [ "${{matrix.package_json_arch}}" = "arm64" ]; then
+            export MARCH_FLAG="-march=armv8-a+crc -mtune=ampere1"
+          elif [ "${{matrix.package_json_arch}}" = "x64" ]; then
+            export MARCH_FLAG="-march=nehalem"
+          fi
           WEBKIT_RELEASE_TYPE=${{matrix.CMAKE_BUILD_TYPE}} CPU="native" cpu=native LTO_FLAG="${{matrix.lto_flag}}" temp=${{runner.temp}} ENABLE_SANITIZERS="${{matrix.ENABLE_SANITIZERS}}" bash release.sh
           cd ${{runner.temp}}
           echo "#define BUN_WEBKIT_VERSION \"${{ inputs.build_ref }}\"" >> bun-webkit/include/cmakeconfig.h
@@ -366,6 +371,11 @@ jobs:
       - name: Run
         run: |
           rm -rf ${{runner.temp}}/bun-webkit ${{runner.temp}}/bun-webkit.tar.gz
+          if [ "${{matrix.package_json_arch}}" = "arm64" ]; then
+            export MARCH_FLAG="-march=armv8-a+crc -mtune=ampere1"
+          elif [ "${{matrix.package_json_arch}}" = "x64" ]; then
+            export MARCH_FLAG="-march=nehalem"
+          fi
           WEBKIT_RELEASE_TYPE=${{matrix.CMAKE_BUILD_TYPE}} CPU="native" cpu=native LTO_FLAG="${{matrix.lto_flag}}" temp=${{runner.temp}} bash musl-release.sh
           cd ${{runner.temp}}
           echo "#define BUN_WEBKIT_VERSION \"${{ inputs.build_ref }}\"" >> bun-webkit/include/cmakeconfig.h

Dockerfile

@@ -154,8 +154,8 @@ ENV LIBRARY_PATH="/usr/lib/gcc/x86_64-linux-gnu/13:/usr/lib/x86_64-linux-gnu"
 ENV CPLUS_INCLUDE_PATH="/usr/include/c++/13:/usr/include/x86_64-linux-gnu/c++/13"
 ENV C_INCLUDE_PATH="/usr/lib/gcc/x86_64-linux-gnu/13/include"
 
-ENV CFLAGS="${DEFAULT_CFLAGS} $CFLAGS -stdlib=libstdc++"
-ENV CXXFLAGS="${DEFAULT_CFLAGS} $CXXFLAGS -stdlib=libstdc++"
+ENV CFLAGS="${DEFAULT_CFLAGS} ${MARCH_FLAG} $CFLAGS -stdlib=libstdc++"
+ENV CXXFLAGS="${DEFAULT_CFLAGS} ${MARCH_FLAG} $CXXFLAGS -stdlib=libstdc++"
 ENV LDFLAGS="-fuse-ld=lld -L/usr/lib/gcc/x86_64-linux-gnu/13 -L/usr/lib/x86_64-linux-gnu"
 
 # Verify toolchain setup

Dockerfile.musl

@@ -46,8 +46,8 @@ RUN apk add --no-cache cpio curl tar
 
 ADD https://github.com/unicode-org/icu/releases/download/release-75-1/icu4c-75_1-src.tgz /icu.tgz
 RUN --mount=type=tmpfs,target=/icu \
-    export CFLAGS="${DEFAULT_CFLAGS} $CFLAGS -Os -std=c17 $LTO_FLAG" && \
-    export CXXFLAGS="${DEFAULT_CFLAGS} $CXXFLAGS -Os -std=c++20 -fno-exceptions $LTO_FLAG -fno-c++-static-destructors " && \
+    export CFLAGS="${DEFAULT_CFLAGS} ${MARCH_FLAG} $CFLAGS -Os -std=c17 $LTO_FLAG" && \
+    export CXXFLAGS="${DEFAULT_CFLAGS} ${MARCH_FLAG} $CXXFLAGS -Os -std=c++20 -fno-exceptions $LTO_FLAG -fno-c++-static-destructors " && \
     export LDFLAGS="-fuse-ld=lld " && \
     cd /icu && \
     tar -xf /icu.tgz --strip-components=1 && \
@@ -78,8 +78,8 @@ WORKDIR /webkit
 COPY --from=build_icu /output /icu
 
 RUN --mount=type=tmpfs,target=/webkitbuild \
-    export CFLAGS="${DEFAULT_CFLAGS} $CFLAGS $LTO_FLAG -ffile-prefix-map=/webkit/Source=vendor/WebKit/Source  -ffile-prefix-map=/webkitbuild/=. " && \
-    export CXXFLAGS="${DEFAULT_CFLAGS} $CXXFLAGS $LTO_FLAG -fno-c++-static-destructors -ffile-prefix-map=/webkit/Source=vendor/WebKit/Source -ffile-prefix-map=/webkitbuild/=. " && \
+    export CFLAGS="${DEFAULT_CFLAGS} ${MARCH_FLAG} $CFLAGS $LTO_FLAG -ffile-prefix-map=/webkit/Source=vendor/WebKit/Source  -ffile-prefix-map=/webkitbuild/=. " && \
+    export CXXFLAGS="${DEFAULT_CFLAGS} ${MARCH_FLAG} $CXXFLAGS $LTO_FLAG -fno-c++-static-destructors -ffile-prefix-map=/webkit/Source=vendor/WebKit/Source -ffile-prefix-map=/webkitbuild/=. " && \
     export LDFLAGS="-fuse-ld=lld $LDFLAGS " && \
     cd /webkitbuild && \
     cmake \

musl-release.sh

@@ -34,6 +34,16 @@ fi
 
 export WEBKIT_RELEASE_TYPE=${WEBKIT_RELEASE_TYPE:-"Release"}
 
+# Set default MARCH_FLAG based on architecture if not already set
+if [ -z "${MARCH_FLAG:-}" ]; then
+    if [ "$BUILDKIT_ARCH" == "arm64" ]; then
+        export MARCH_FLAG="-march=armv8-a+crc -mtune=ampere1"
+    elif [ "$BUILDKIT_ARCH" == "amd64" ]; then
+        export MARCH_FLAG="-march=nehalem"
+    fi
+fi
+export MARCH_FLAG="${MARCH_FLAG:-""}"
+
 export CONTAINER_NAME=bun-webkit-linux-$BUILDKIT_ARCH
 
 if [ "$WEBKIT_RELEASE_TYPE" == "relwithdebuginfo" ]; then
@@ -43,4 +53,4 @@ fi
 mkdir -p $temp
 rm -rf $temp/bun-webkit
 
-docker buildx build -f Dockerfile.musl -t $CONTAINER_NAME --build-arg LTO_FLAG="$LTO_FLAG" --build-arg WEBKIT_RELEASE_TYPE=$WEBKIT_RELEASE_TYPE --progress=plain --platform=linux/$BUILDKIT_ARCH --target=artifact --output type=local,dest=$temp/bun-webkit .
+docker buildx build -f Dockerfile.musl -t $CONTAINER_NAME --build-arg LTO_FLAG="$LTO_FLAG" --build-arg MARCH_FLAG="$MARCH_FLAG" --build-arg WEBKIT_RELEASE_TYPE=$WEBKIT_RELEASE_TYPE --progress=plain --platform=linux/$BUILDKIT_ARCH --target=artifact --output type=local,dest=$temp/bun-webkit .

release.sh

@@ -34,6 +34,16 @@ fi
 
 export WEBKIT_RELEASE_TYPE=${WEBKIT_RELEASE_TYPE:-"Release"}
 
+# Set default MARCH_FLAG based on architecture if not already set
+if [ -z "${MARCH_FLAG:-}" ]; then
+    if [ "$BUILDKIT_ARCH" == "arm64" ]; then
+        export MARCH_FLAG="-march=armv8-a+crc -mtune=ampere1"
+    elif [ "$BUILDKIT_ARCH" == "amd64" ]; then
+        export MARCH_FLAG="-march=nehalem"
+    fi
+fi
+export MARCH_FLAG="${MARCH_FLAG:-""}"
+
 export CONTAINER_NAME=bun-webkit-linux-$BUILDKIT_ARCH
 
 if [ "$WEBKIT_RELEASE_TYPE" == "relwithdebuginfo" ]; then
@@ -55,6 +65,7 @@ docker buildx build \
   -t $CONTAINER_NAME \
   --build-arg ENABLE_SANITIZERS=$ENABLE_SANITIZERS \
   --build-arg LTO_FLAG="$LTO_FLAG" \
+  --build-arg MARCH_FLAG="$MARCH_FLAG" \
   --build-arg RELEASE_FLAGS="$RELEASE_FLAGS" \
   --build-arg WEBKIT_RELEASE_TYPE=$WEBKIT_RELEASE_TYPE \
   --build-arg RELEASE_FLAGS="${RELEASE_FLAGS:-"-O2 -DNDEBUG=1"}" \