From 55f17fff3669e09157de8a69a7a51181403228d0 Mon Sep 17 00:00:00 2001 From: Liav A Date: Tue, 4 Oct 2022 02:48:37 +0300 Subject: [PATCH] Meta: Remove i686 target --- .github/workflows/cmake.yml | 12 ++++------- .../workflows/pvs-studio-static-analysis.yml | 2 +- .../workflows/sonar-cloud-static-analysis.yml | 2 +- Meta/Azure/Caches.yml | 2 +- Meta/Azure/Serenity.yml | 2 +- Meta/ShellCompletions/zsh/_serenity | 3 +-- Meta/build-image-qemu.sh | 5 ----- Meta/debug-kernel.sh | 4 ---- Meta/run.sh | 6 +++--- Meta/serenity.sh | 20 ++++++++----------- README.md | 4 ++-- Toolchain/BuildClang.sh | 3 +-- Toolchain/CMake/LLVMConfig.cmake | 2 +- ...0001-Add-a-gcc-driver-for-SerenityOS.patch | 2 +- ...03-Driver-Add-support-for-SerenityOS.patch | 13 ------------ azure-pipelines.yml | 4 ---- 16 files changed, 25 insertions(+), 61 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index f9a801dfd07..7762519296c 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -22,13 +22,9 @@ jobs: matrix: debug-options: ['ALL_DEBUG', 'NORMAL_DEBUG'] os: [ubuntu-22.04] - arch: ['i686', 'x86_64'] + arch: ['x86_64'] # If ccache is broken and you would like to bust the ccache cache on Github Actions, increment this: ccache-mark: [0] - exclude: - # We currently manually disable the ALL_DEBUG build on x86_64 for sake of saving CI time, as it is not our main target right now - - debug-options: 'ALL_DEBUG' - arch: 'x86_64' steps: # Pull requests can trail behind `master` and can cause breakage if merging before running the CI checks on an updated branch. @@ -121,8 +117,8 @@ jobs: - name: Show ccache stats before build and configure run: | # We only have 5 GiB of cache available *in total*. Beyond that, GitHub deletes caches. - # Currently, we use about 130 MB for the two toolchains (i686 & x86_64), and three ccache caches: - # One with ALL_DEBUG (i686) and two with NORMAL_DEBUG (i686 & x86_64). + # Currently, we use about 130 MB for the toolchains (x86_64), and 2 ccache caches: + # One with ALL_DEBUG (x86_64), and one with NORMAL_DEBUG (x86_64). # Therefore, using 1.6 GB or more per cache causes disaster. # Building from scratch fills the ccache cache from 0 to about 0.7 GB, and after compression it comes out to # about 0.25 GB, so 3 GB (1GB after compression) should be plenty, all while comfortably fitting in the cache. @@ -231,7 +227,7 @@ jobs: run: '[ ! -e debug.log ] || cat debug.log' - name: Check manpages for completeness - if: ${{ matrix.debug-options == 'NORMAL_DEBUG' && matrix.arch == 'i686'}} + if: ${{ matrix.debug-options == 'NORMAL_DEBUG' && matrix.arch == 'x86_64'}} working-directory: ${{ github.workspace }}/Build/${{ matrix.arch }} env: # The script already sets the correct SERENITY_RUN and SERENITY_KERNEL_CMDLINE envvars. diff --git a/.github/workflows/pvs-studio-static-analysis.yml b/.github/workflows/pvs-studio-static-analysis.yml index 967f5c6739d..c8da2ebf5a0 100644 --- a/.github/workflows/pvs-studio-static-analysis.yml +++ b/.github/workflows/pvs-studio-static-analysis.yml @@ -9,7 +9,7 @@ jobs: name: Static Analysis runs-on: ubuntu-22.04 env: - PVS_STUDIO_ANALYSIS_ARCH: i686 + PVS_STUDIO_ANALYSIS_ARCH: x86_64 if: always() && github.repository == 'SerenityOS/serenity' && github.ref == 'refs/heads/master' steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/sonar-cloud-static-analysis.yml b/.github/workflows/sonar-cloud-static-analysis.yml index bed563771f6..5f1993ffffa 100644 --- a/.github/workflows/sonar-cloud-static-analysis.yml +++ b/.github/workflows/sonar-cloud-static-analysis.yml @@ -13,7 +13,7 @@ jobs: # Latest scanner version is tracked on: https://docs.sonarcloud.io/advanced-setup/ci-based-analysis/sonarscanner-cli/ SONAR_SCANNER_VERSION: 4.7.0.2747 SONAR_SERVER_URL: "https://sonarcloud.io" - SONAR_ANALYSIS_ARCH: i686 + SONAR_ANALYSIS_ARCH: x86_64 steps: - uses: actions/checkout@v3 with: diff --git a/Meta/Azure/Caches.yml b/Meta/Azure/Caches.yml index 166070df162..2d9fad93805 100644 --- a/Meta/Azure/Caches.yml +++ b/Meta/Azure/Caches.yml @@ -1,6 +1,6 @@ parameters: os: 'Linux' - arch: 'i686' + arch: 'x86_64' toolchain: 'gcc' coverage: 'OFF' download_cache_path: '' diff --git a/Meta/Azure/Serenity.yml b/Meta/Azure/Serenity.yml index 9458261e3c8..c727df8b9f0 100644 --- a/Meta/Azure/Serenity.yml +++ b/Meta/Azure/Serenity.yml @@ -1,5 +1,5 @@ parameters: - arch: 'i686' + arch: 'x86_64' coverage: 'OFF' jobs: diff --git a/Meta/ShellCompletions/zsh/_serenity b/Meta/ShellCompletions/zsh/_serenity index 551887e307c..d2916a3f1b7 100644 --- a/Meta/ShellCompletions/zsh/_serenity +++ b/Meta/ShellCompletions/zsh/_serenity @@ -28,8 +28,7 @@ _serenity() { local targets targets=( - 'i686:Target i686 (default)' - 'x86_64:Target x86_64' + 'x86_64:Target x86_64 (default)' 'aarch64:Target aarch64' 'lagom:Target host machine' ) diff --git a/Meta/build-image-qemu.sh b/Meta/build-image-qemu.sh index b7bb84ab660..852789ef7cf 100755 --- a/Meta/build-image-qemu.sh +++ b/Meta/build-image-qemu.sh @@ -32,11 +32,6 @@ fi # Prepend the toolchain qemu directory so we pick up QEMU from there PATH="$SCRIPT_DIR/../Toolchain/Local/qemu/bin:$PATH" -# Also prepend the i686 toolchain directory because that's where most -# people will have their QEMU binaries if they built them before the -# directory was changed to Toolchain/Local/qemu. -PATH="$SCRIPT_DIR/../Toolchain/Local/i686/bin:$PATH" - # We depend on GNU coreutils du for the --apparent-size extension. # GNU coreutils is a build dependency. if command -v gdu > /dev/null 2>&1 && gdu --version | grep -q "GNU coreutils"; then diff --git a/Meta/debug-kernel.sh b/Meta/debug-kernel.sh index 5ba4ae0d4e2..603eeb6dc6a 100755 --- a/Meta/debug-kernel.sh +++ b/Meta/debug-kernel.sh @@ -31,10 +31,6 @@ if [ "$SERENITY_ARCH" = "x86_64" ]; then gdb_arch=i386:x86-64 prekernel_image=Prekernel64 kernel_base=0x2000200000 -elif [ "$SERENITY_ARCH" = "i686" ]; then - gdb_arch=i386:intel - prekernel_image=Prekernel32 - kernel_base=0xc0200000 elif [ "$SERENITY_ARCH" = "aarch64" ]; then gdb_arch=aarch64:armv8-r prekernel_image=Prekernel diff --git a/Meta/run.sh b/Meta/run.sh index 2f42cbf25bb..b48e1d4e372 100755 --- a/Meta/run.sh +++ b/Meta/run.sh @@ -49,10 +49,10 @@ fi # Prepend the toolchain qemu directory so we pick up QEMU from there PATH="$SCRIPT_DIR/../Toolchain/Local/qemu/bin:$PATH" -# Also prepend the i686 toolchain directory because that's where most +# Also prepend the x86_64 toolchain directory because that's where most # people will have their QEMU binaries if they built them before the # directory was changed to Toolchain/Local/qemu. -PATH="$SCRIPT_DIR/../Toolchain/Local/i686/bin:$PATH" +PATH="$SCRIPT_DIR/../Toolchain/Local/x86_64/bin:$PATH" SERENITY_RUN="${SERENITY_RUN:-$1}" @@ -75,7 +75,7 @@ if [ -z "$SERENITY_QEMU_BIN" ]; then elif [ "$SERENITY_ARCH" = "x86_64" ]; then SERENITY_QEMU_BIN="${QEMU_BINARY_PREFIX}qemu-system-x86_64${QEMU_BINARY_SUFFIX}" else - SERENITY_QEMU_BIN="${QEMU_BINARY_PREFIX}qemu-system-i386${QEMU_BINARY_SUFFIX}" + die "Please specify a valid CPU architecture." fi fi diff --git a/Meta/serenity.sh b/Meta/serenity.sh index ffe9e23c55a..9dcec769929 100755 --- a/Meta/serenity.sh +++ b/Meta/serenity.sh @@ -7,7 +7,7 @@ print_help() { NAME=$(basename "$ARG0") cat <