ncroxon · pbatard · Jul 23, 2026
diff --git a/.github/workflows/linux-gcc-musl.yml b/.github/workflows/linux-gcc-musl.yml
@@ -11,12 +11,6 @@ jobs:
         arch: [x64]
         include:
           - arch: x64
-            dir: x64
-            musl: musl-dev
-            cross_compile: x86_64-linux-musl-
-        arch: [x86_64]
-        include:
-          - arch: x86_64
             dir: x86_64
             musl: musl-dev
             cross_compile: x86_64-linux-musl-
@@ -62,15 +56,6 @@ jobs:
           pkg: qemu-system-x86
           qemu_arch: x86_64
           qemu_opts: -M q35
-          fw_arch: x64
-          fw_base: OVMF
-        arch: [x86_64]
-        include:
-        - arch: x86_64
-          pkg: qemu-system-x86
-          qemu_arch: x86_64
-          qemu_opts: -M q35
-          fw_arch: x64
           fw_base: OVMF
 
     steps:
@@ -91,7 +76,7 @@ jobs:
 
     - name: Download UEFI firmware
       run: |
-        fw_arch=$(echo ${{ matrix.fw_arch }} | tr a-z A-Z)
+        fw_arch=$(echo ${{ matrix.arch }} | tr a-z A-Z)
         fw_zip=${{ matrix.fw_base }}-${fw_arch}.zip
         curl -O https://efi.akeo.ie/${{ matrix.fw_base }}/${fw_zip}
         7z x ${fw_zip}
@@ -100,11 +85,11 @@ jobs:
     - name: Download UEFI Shell
       run: |
         mkdir -p ./image/efi/boot
-        curl -L https://github.com/pbatard/UEFI-Shell/releases/download/24H2/shell${{ matrix.fw_arch }}.efi -o ./image/efi/boot/boot${{ matrix.fw_arch }}.efi
+        curl -L https://github.com/pbatard/UEFI-Shell/releases/download/24H2/shell${{ matrix.arch }}.efi -o ./image/efi/boot/boot${{ matrix.arch }}.efi
 
     - name: Run tests
       run: |
-        export UEFI_ARCH=${{ matrix.fw_arch }}
+        export UEFI_ARCH=${{ matrix.arch }}
         export UEFI_DIR=./image
         export QEMU_CMD="qemu-system-${{ matrix.qemu_arch }} ${{ matrix.qemu_opts }} -nodefaults -nographic -serial stdio -net none -L . -drive if=pflash,format=raw,unit=0,file=${{ matrix.fw_base }}.fd,readonly=on -drive format=raw,file=fat:rw:image"
         ./tests/gen_tests.sh ./tests/test_list.txt

diff --git a/.github/workflows/linux-gcc.yml b/.github/workflows/linux-gcc.yml
@@ -8,18 +8,14 @@ jobs:
 
     strategy:
       matrix:
-        arch: [ia32, x86_64, x64, aa64, arm, riscv64, loongarch64]
+        arch: [ia32, x64, aa64, arm, riscv64, loongarch64]
         include:
           - arch: ia32
             dir: ia32
             gcc: multilib
             cross_compile:
-          - arch: x86_64
-            dir: x86_64
-            gcc: multilib
-            cross_compile:
           - arch: x64
-            dir: x64
+            dir: x86_64
             gcc: multilib
             cross_compile:
           - arch: aa64
@@ -79,49 +75,37 @@ jobs:
 
     strategy:
       matrix:
-        arch: [x86_64, x64, ia32, aa64, arm, riscv64, loongarch64]
+        arch: [x64, ia32, aa64, arm, riscv64, loongarch64]
         include:
         - arch: x64
           pkg: qemu-system-x86
           qemu_arch: x86_64
           qemu_opts: -M q35
-          fw_arch: x64
-          fw_base: OVMF
-        - arch: x86_64
-          pkg: qemu-system-x86
-          qemu_arch: x86_64
-          qemu_opts: -M q35
-          fw_arch: x64
           fw_base: OVMF
         - arch: ia32
           pkg: qemu-system-x86
           qemu_arch: i386
           qemu_opts: -M pc
-          fw_arch: ia32
           fw_base: OVMF
         - arch: aa64
           pkg: qemu-system-arm
           qemu_arch: aarch64
           qemu_opts: -M virt -cpu cortex-a57
-          fw_arch: aa64
           fw_base: AAVMF
         - arch: arm
           pkg: qemu-system-arm
           qemu_arch: arm
           qemu_opts: -M virt -cpu cortex-a15
-          fw_arch: arm
           fw_base: AAVMF
         - arch: riscv64
           pkg: qemu-system-riscv64
           qemu_arch: riscv64
           qemu_opts: -M virt,pflash0=pflash0
-          fw_arch: riscv64
           fw_base: QEMU_EFI
         - arch: loongarch64
           pkg: qemu-system-loongarch64
           qemu_arch: loongarch64
           qemu_opts: -M virt -cpu la464
-          fw_arch: loongarch64
           fw_base: QEMU_EFI
 
     steps:
@@ -142,7 +126,7 @@ jobs:
 
     - name: Download UEFI firmware
       run: |
-        fw_arch=$(echo ${{ matrix.fw_arch }} | tr a-z A-Z)
+        fw_arch=$(echo ${{ matrix.arch }} | tr a-z A-Z)
         fw_zip=${{ matrix.fw_base }}-${fw_arch}.zip
         curl -O https://efi.akeo.ie/${{ matrix.fw_base }}/${fw_zip}
         7z x ${fw_zip}
@@ -151,11 +135,11 @@ jobs:
     - name: Download UEFI Shell
       run: |
         mkdir -p ./image/efi/boot
-        curl -L https://github.com/pbatard/UEFI-Shell/releases/download/24H2/shell${{ matrix.fw_arch }}.efi -o ./image/efi/boot/boot${{ matrix.fw_arch }}.efi
+        curl -L https://github.com/pbatard/UEFI-Shell/releases/download/24H2/shell${{ matrix.arch }}.efi -o ./image/efi/boot/boot${{ matrix.arch }}.efi
 
     - name: Run tests
       run: |
-        export UEFI_ARCH=${{ matrix.fw_arch }}
+        export UEFI_ARCH=${{ matrix.arch }}
         export UEFI_DIR=./image
         if [ "$UEFI_ARCH" = "riscv64" ]; then
           export QEMU_CMD="qemu-system-${{ matrix.qemu_arch }} ${{ matrix.qemu_opts }} -nodefaults -nographic -serial stdio -net none -L . -blockdev node-name=pflash0,driver=file,read-only=on,filename=${{ matrix.fw_base }}.fd -drive format=raw,file=fat:rw:image,id=drv1 -device virtio-blk-device,drive=drv1"

diff --git a/.github/workflows/linux-llvm.yml b/.github/workflows/linux-llvm.yml
@@ -11,12 +11,6 @@ jobs:
         arch: [x64]
         include:
           - arch: x64
-            dir: x64
-            gcc: multilib
-            cross_compile:
-        arch: [x86_64]
-        include:
-          - arch: x86_64
             dir: x86_64
             gcc: multilib
             cross_compile:
@@ -56,15 +50,6 @@ jobs:
           pkg: qemu-system-x86
           qemu_arch: x86_64
           qemu_opts: -M q35
-          fw_arch: x64
-          fw_base: OVMF
-        arch: [x86_64]
-        include:
-        - arch: x86_64
-          pkg: qemu-system-x86
-          qemu_arch: x86_64
-          qemu_opts: -M q35
-          fw_arch: x64
           fw_base: OVMF
 
     steps:
@@ -85,7 +70,7 @@ jobs:
 
     - name: Download UEFI firmware
       run: |
-        fw_arch=$(echo ${{ matrix.fw_arch }} | tr a-z A-Z)
+        fw_arch=$(echo ${{ matrix.arch }} | tr a-z A-Z)
         fw_zip=${{ matrix.fw_base }}-${fw_arch}.zip
         curl -O https://efi.akeo.ie/${{ matrix.fw_base }}/${fw_zip}
         7z x ${fw_zip}
@@ -94,11 +79,11 @@ jobs:
     - name: Download UEFI Shell
       run: |
         mkdir -p ./image/efi/boot
-        curl -L https://github.com/pbatard/UEFI-Shell/releases/download/24H2/shell${{ matrix.fw_arch }}.efi -o ./image/efi/boot/boot${{ matrix.fw_arch }}.efi
+        curl -L https://github.com/pbatard/UEFI-Shell/releases/download/24H2/shell${{ matrix.arch }}.efi -o ./image/efi/boot/boot${{ matrix.arch }}.efi
 
     - name: Run tests
       run: |
-        export UEFI_ARCH=${{ matrix.fw_arch }}
+        export UEFI_ARCH=${{ matrix.arch }}
         export UEFI_DIR=./image
         export QEMU_CMD="qemu-system-${{ matrix.qemu_arch }} ${{ matrix.qemu_opts }} -nodefaults -nographic -serial stdio -net none -L . -drive if=pflash,format=raw,unit=0,file=${{ matrix.fw_base }}.fd,readonly=on -drive format=raw,file=fat:rw:image"
         ./tests/gen_tests.sh ./tests/test_list.txt

diff --git a/.github/workflows/linux-mingw.yml b/.github/workflows/linux-mingw.yml
@@ -8,9 +8,9 @@ jobs:
 
     strategy:
       matrix:
-        arch: [x86_64, ia32]
+        arch: [x64, ia32]
         include:
-        - arch: x86_64
+        - arch: x64
           dir: x86_64
           pkg: gcc-mingw-w64-x86-64
           tuple: x86_64-w64-mingw32-
@@ -43,19 +43,17 @@ jobs:
 
     strategy:
       matrix:
-        arch: [x86_64, ia32]
+        arch: [x64, ia32]
         include:
-        - arch: x86_64
+        - arch: x64
           pkg: qemu-system-x86
           qemu_arch: x86_64
           qemu_opts: -M q35
-          fw_arch: x64
           fw_base: OVMF
         - arch: ia32
           pkg: qemu-system-x86
           qemu_arch: i386
           qemu_opts: -M pc
-          fw_arch: ia32
           fw_base: OVMF
 
     steps:
@@ -76,7 +74,7 @@ jobs:
 
     - name: Download UEFI firmware
       run: |
-        fw_arch=$(echo ${{ matrix.fw_arch }} | tr a-z A-Z)
+        fw_arch=$(echo ${{ matrix.arch }} | tr a-z A-Z)
         fw_zip=${{ matrix.fw_base }}-${fw_arch}.zip
         curl -O https://efi.akeo.ie/${{ matrix.fw_base }}/${fw_zip}
         7z x ${fw_zip}
@@ -85,11 +83,11 @@ jobs:
     - name: Download UEFI Shell
       run: |
         mkdir -p ./image/efi/boot
-        curl -L https://github.com/pbatard/UEFI-Shell/releases/download/24H2/shell${{ matrix.fw_arch }}.efi -o ./image/efi/boot/boot${{ matrix.fw_arch }}.efi
+        curl -L https://github.com/pbatard/UEFI-Shell/releases/download/24H2/shell${{ matrix.arch }}.efi -o ./image/efi/boot/boot${{ matrix.arch }}.efi
 
     - name: Run tests
       run: |
-         export UEFI_ARCH=${{ matrix.fw_arch }}
+         export UEFI_ARCH=${{ matrix.arch }}
          export UEFI_DIR=./image
          export QEMU_CMD="qemu-system-${{ matrix.qemu_arch }} ${{ matrix.qemu_opts }} -L . -drive if=pflash,format=raw,unit=0,file=${{ matrix.fw_base }}.fd,readonly=on -drive format=raw,file=fat:rw:image -nodefaults -nographic -serial stdio -net none"
          ./tests/gen_tests.sh ./tests/test_list.txt

diff --git a/.github/workflows/macos-gcc.yml b/.github/workflows/macos-gcc.yml
@@ -8,17 +8,13 @@ jobs:
 
     strategy:
       matrix:
-        arch: [x64, ia32, x86_64, aa64, arm]
+        arch: [ia32, x64, aa64, arm]
         include:
           - arch: ia32
             dir: ia32
             cross_compile: i686-elf-
             toolchain: i686-elf-gcc
           - arch: x64
-            dir: x64
-            cross_compile: x86_64-elf-
-            toolchain: x86_64-elf-gcc
-          - arch: x86_64
             dir: x86_64
             cross_compile: x86_64-elf-
             toolchain: x86_64-elf-gcc
@@ -62,37 +58,27 @@ jobs:
 
     strategy:
       matrix:
-        arch: [x64, ia32, x86_64, aa64, arm]
+        arch: [ia32, x64, aa64, arm]
         include:
         - arch: x64
           pkg: qemu-system-x86
           qemu_arch: x86_64
           qemu_opts: -M q35
-          fw_arch: x64
-          fw_base: OVMF
-        - arch: x86_64
-          pkg: qemu-system-x86
-          qemu_arch: x86_64
-          qemu_opts: -M q35
-          fw_arch: x64
           fw_base: OVMF
         - arch: ia32
           pkg: qemu-system-x86
           qemu_arch: i386
           qemu_opts: -M pc
-          fw_arch: ia32
           fw_base: OVMF
         - arch: aa64
           pkg: qemu-system-arm
           qemu_arch: aarch64
           qemu_opts: -M virt -cpu cortex-a57
-          fw_arch: aa64
           fw_base: AAVMF
         - arch: arm
           pkg: qemu-system-arm
           qemu_arch: arm
           qemu_opts: -M virt -cpu cortex-a15
-          fw_arch: arm
           fw_base: AAVMF
 
     steps:
@@ -113,7 +99,7 @@ jobs:
 
     - name: Download UEFI firmware
       run: |
-        fw_arch=$(echo ${{ matrix.fw_arch }} | tr a-z A-Z)
+        fw_arch=$(echo ${{ matrix.arch }} | tr a-z A-Z)
         fw_zip=${{ matrix.fw_base }}-${fw_arch}.zip
         curl -O https://efi.akeo.ie/${{ matrix.fw_base }}/${fw_zip}
         7z x ${fw_zip}
@@ -122,11 +108,11 @@ jobs:
     - name: Download UEFI Shell
       run: |
         mkdir -p ./image/efi/boot
-        curl -L https://github.com/pbatard/UEFI-Shell/releases/download/24H2/shell${{ matrix.fw_arch }}.efi -o ./image/efi/boot/boot${{ matrix.fw_arch }}.efi
+        curl -L https://github.com/pbatard/UEFI-Shell/releases/download/24H2/shell${{ matrix.arch }}.efi -o ./image/efi/boot/boot${{ matrix.arch }}.efi
 
     - name: Run tests
       run: |
-        export UEFI_ARCH=${{ matrix.fw_arch }}
+        export UEFI_ARCH=${{ matrix.arch }}
         export UEFI_DIR=./image
         export QEMU_CMD="qemu-system-${{ matrix.qemu_arch }} ${{ matrix.qemu_opts }} -nodefaults -nographic -serial stdio -net none -L . -drive if=pflash,format=raw,unit=0,file=${{ matrix.fw_base }}.fd,readonly=on -drive format=raw,file=fat:rw:image"
         ./tests/gen_tests.sh ./tests/test_list.txt