Merge pull request #1003 from lifting-bits/remove-llvm-14

Remove LLVM 14 support

Author: Peter Goodman

.github/workflows/vcpkg_ci_amd64.yml

@@ -36,7 +36,7 @@ jobs:
           - { name: 'ubuntu-20.04', arch: 'amd64', triplet: 'x64-linux-rel', arch_docker: '' }
         image:
           - { name: 'ubuntu', tag: '20.04' }
-        llvm: [ 'llvm-14', 'llvm-14[pasta]', 'llvm-15', 'llvm-15[pasta]' ]
+        llvm: [ 'llvm-15', 'llvm-15[pasta]' ]
 
     container:
       image: docker.pkg.github.com/lifting-bits/cxx-common/vcpkg-builder-${{ matrix.image.name }}:${{ matrix.image.tag }}${{ matrix.host.arch_docker }}
@@ -194,7 +194,7 @@ jobs:
       - name: 'Remill build'
         shell: 'bash'
         working-directory: remill
-        # if: contains(matrix.llvm, 'llvm-14')
+        if: contains(matrix.llvm, 'llvm-15')
         run: |
           cmake -G Ninja \
             -DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -209,14 +209,14 @@ jobs:
       - name: 'Remill test'
         shell: 'bash'
         working-directory: remill/build
-        # if: contains(matrix.llvm, 'llvm-14')
+        if: contains(matrix.llvm, 'llvm-15')
         run: |
           env CTEST_OUTPUT_ON_FAILURE=1 ctest .
 
       - name: 'Anvill build'
         shell: 'bash'
         working-directory: anvill
-        # if: contains(matrix.llvm, 'llvm-14')
+        if: contains(matrix.llvm, 'llvm-15')
         run: |
           cmake -G Ninja \
             -DCMAKE_VERBOSE_MAKEFILE=ON \

.github/workflows/vcpkg_ci_mac.yml

@@ -33,7 +33,7 @@ jobs:
       matrix:
         os:
           - { runner: 'macos-11', xcode: '13.0' }
-        llvm: [ 'llvm-14', 'llvm-14[pasta]', 'llvm-15', 'llvm-15[pasta]' ]
+        llvm: [ 'llvm-15', 'llvm-15[pasta]' ]
         target_arch: [ 'x64', 'arm64' ]
 
     runs-on: ${{ matrix.os.runner }}

.github/workflows/vcpkg_ci_windows.yml

@@ -35,7 +35,6 @@ jobs:
       fail-fast: false
       matrix:
         llvm: [
-          'llvm-14',
           'llvm-15'
           ]
 
@@ -133,7 +132,7 @@ jobs:
           path: ${{ env.VCPKG_ROOT }}/${{ env.ARTIFACT_NAME }}.7z
 
       - name: 'Test rellic build'
-        if: ${{ matrix.llvm == 'llvm-14' }}
+        if: ${{ matrix.llvm == 'llvm-15' }}
         run: |
           cd rellic
           Remove-Item -Recurse -Force -ErrorAction SilentlyContinue .\build
@@ -151,7 +150,7 @@ jobs:
           # python ../scripts/roundtrip.py ( Get-ChildItem tools | Where-Object {$_.name -match "rellic-decomp.exe"} ) ..\tests\tools\decomp "${env:VCPKG_ROOT}\installed\${env:TRIPLET}\tools\${{ matrix.llvm }}\clang.exe"
 
       - name: 'Test remill build'
-        # if: ${{ matrix.llvm == 'llvm-14' }}
+        if: ${{ matrix.llvm == 'llvm-15' }}
         run: |
           cd remill
           Remove-Item -Recurse -Force -ErrorAction SilentlyContinue .\build
@@ -174,7 +173,7 @@ jobs:
           # env CTEST_OUTPUT_ON_FAILURE=1 cmake --build . --target test || true
 
       - name: 'Anvill build'
-        # if: ${{ matrix.llvm == 'llvm-14' }}
+        if: ${{ matrix.llvm == 'llvm-15' }}
         run: |
           cd anvill
           Remove-Item -Recurse -Force -ErrorAction SilentlyContinue .\build

README.md

@@ -13,14 +13,14 @@ To use the dependencies, just download the compressed file and decompress it. Th
 For example:
 
 ```bash
-curl -LO https://github.com/lifting-bits/cxx-common/releases/latest/download/vcpkg_ubuntu-20.04_llvm-14_amd64.tar.xz
-tar -xJf vcpkg_ubuntu-20.04_llvm-14_amd64.tar.xz
+curl -LO https://github.com/lifting-bits/cxx-common/releases/latest/download/vcpkg_ubuntu-20.04_llvm-15_amd64.tar.xz
+tar -xJf vcpkg_ubuntu-20.04_llvm-15_amd64.tar.xz
 ```
 
 Will produce a directory, and then you'll have to set the following during your CMake configure command to use these dependencies!
 
 ```text
--DCMAKE_TOOLCHAIN_FILE="<...>/vcpkg_ubuntu-20.04_llvm-14_amd64/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=x64-linux-rel
+-DCMAKE_TOOLCHAIN_FILE="<...>/vcpkg_ubuntu-20.04_llvm-15_amd64/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=x64-linux-rel
 ```
 
 Replace `x64-linux-rel` with `x64-osx-rel` if using the macOS pre-built download.
@@ -29,12 +29,12 @@ Replace `x64-linux-rel` with `x64-osx-rel` if using the macOS pre-built download
 
 If you aren't running a supported operating system, or you want to have dependencies with a build type other than `Release`, you can build everything from source using the `./build_dependencies.sh` script (pass `--help` to see available options).
 
-By default, the script will install the dependencies listed in [`dependencies.txt`](./dependencies.txt), which doesn't include an LLVM version, so passing an `llvm-14` string as an argument will actually be passed to [`vcpkg install`](https://github.com/microsoft/vcpkg/blob/master/docs/examples/installing-and-using-packages.md#install). Any other strings not matching the script's own options are also passed to the `vcpkg install` command. Furthermore, without specifying any other build script options, vcpkg determine determine the best triplet for your operating system, which means building _both_ `Debug` and `Release` build types (see the [vcpkg triplet docs](https://github.com/microsoft/vcpkg/blob/master/docs/users/triplets.md) for more info).
+By default, the script will install the dependencies listed in [`dependencies.txt`](./dependencies.txt), which doesn't include an LLVM version, so passing an `llvm-15` string as an argument will actually be passed to [`vcpkg install`](https://github.com/microsoft/vcpkg/blob/master/docs/examples/installing-and-using-packages.md#install). Any other strings not matching the script's own options are also passed to the `vcpkg install` command. Furthermore, without specifying any other build script options, vcpkg determine determine the best triplet for your operating system, which means building _both_ `Debug` and `Release` build types (see the [vcpkg triplet docs](https://github.com/microsoft/vcpkg/blob/master/docs/users/triplets.md) for more info).
 
-You can customize the features that a particular package is built with by specifying the feature name between brackets, i.e. `llvm-14[target-all]` (build all target backends), to ensure non-default features are also installed along with all default features. The list of features can be found in the target port's `vcpkg.json` file. Please read the [vcpkg docs](https://github.com/microsoft/vcpkg/blob/master/docs/users/selecting-library-features.md#installing-additional-features) for more information about specifying additional features.
+You can customize the features that a particular package is built with by specifying the feature name between brackets, i.e. `llvm-15[target-all]` (build all target backends), to ensure non-default features are also installed along with all default features. The list of features can be found in the target port's `vcpkg.json` file. Please read the [vcpkg docs](https://github.com/microsoft/vcpkg/blob/master/docs/users/selecting-library-features.md#installing-additional-features) for more information about specifying additional features.
 
 ```bash
-./build_dependencies.sh llvm-14
+./build_dependencies.sh llvm-15
 ```
 
 Note that vcpkg will use binary caching to store built dependency packages (usually at `~/.cache/vcpkg` or manually set with environment variable `VCPKG_DEFAULT_BINARY_CACHE`) so that upon reinstallation/rebuilding (re-running the script) you likely won't have to rebuild everything from scratch, unless the package itself has been updated, you are using a different vcpkg triplet, your compiler has been changed/update, or any of the vcpkg scripts have changed (updated vcpkg repo). If you'd like to turn off [binary caching](https://github.com/microsoft/vcpkg/blob/master/docs/users/binarycaching.md) (not recommended), then you can either pass `--no-binarycaching` to the build script after the main options listed in or add `-binarycaching` to the `VCPKG_FEATURE_FLAGS` environment variable.
@@ -46,25 +46,25 @@ Note that vcpkg will use binary caching to store built dependency packages (usua
 Passing `--export-dir <DIR>` to the `./build_dependencies.sh` script, you can install the chosen dependencies in a separate directory. Otherwise, the built dependencies will be stored within the vcpkg repo directory itself (`vcpkg/installed` relative path if in the root of this repo). Separate export directories are required to keep track of different LLVM versions, since they cannot coexist within the same export (read: installation) directory.
 
 ```bash
-./build_dependencies.sh --export-dir vcpkg-llvm-14-install llvm-14
+./build_dependencies.sh --export-dir vcpkg-llvm-15-install llvm-15
 ```
 
-will build all of the dependencies listed in `dependencies.txt` _and_ LLVM 14 and install into a local directory named `vcpkg-llvm-14-install`.
+will build all of the dependencies listed in `dependencies.txt` _and_ LLVM 14 and install into a local directory named `vcpkg-llvm-15-install`.
 
 Furthermore, you are able to install additional dependencies into an existing exported directory created by this script by setting the `--export-dir <path>` to the same path:
 
 ```bash
-./build_dependencies.sh --release --export-dir "<...>/vcpkg_ubuntu-20.04_llvm-14_amd64" spdlog
+./build_dependencies.sh --release --export-dir "<...>/vcpkg_ubuntu-20.04_llvm-15_amd64" spdlog
 ```
 
 When reusing the pre-built export directory downloaded from GitHub, you must specify `--release` (see the 'Debug and Release Builds' section below) to build only release binaries. You cannot use dependencies from different triplets.
 
 ### Debug and Release Builds
 
-To build both debug and release versions with llvm-14, just run the following
+To build both debug and release versions with llvm-15, just run the following
 
 ```bash
-./build_dependencies.sh llvm-14
+./build_dependencies.sh llvm-15
 ```
 
 The script will be verbose about what it is doing and will clone the correct version of vcpkg (found in `vcpkg_info.txt`) and build everything in the `vcpkg` directory in the root of this repo.
@@ -83,7 +83,7 @@ $ ./build_dependencies.sh --export-dir example-export-dir
 If you don't want to compile a debug version of the tools, just pass `--release` to the script.
 
 ```bash
-$ ./build_dependencies.sh --release llvm-14
+$ ./build_dependencies.sh --release llvm-15
 ...
 [+] Set the following in your CMake configure command to use these dependencies!
 [+]   -DCMAKE_TOOLCHAIN_FILE="/Users/ekilmer/src/cxx-common/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=x64-osx-rel -DVCPKG_HOST_TRIPLET=x64-osx-rel
@@ -98,7 +98,7 @@ There is experimental support for compiling dependencies with address sanitizer
 These dependencies can be built with the script by passing `--asan` to the script, and it should work whether building only Release or both Debug and Release:
 
 ```bash
-./build_dependencies.sh [--release] --asan llvm-14
+./build_dependencies.sh [--release] --asan llvm-15
 ```
 
 Just because your dependencies were built with a sanitizer, you'll still need to manually add support for sanitizer usage within your own project. A quick and dirty way involves specifying the extra compilation flags during CMake configure: