Go back to LLVM 18.1.6 (#33)

Hopefully makes `llc.exe` work on Windows again.  This commit makes
only minimal changes to add `llvm-objcopy` to the set of packaged
binaries (it's already built, but so far it was being renamed to
`llvm-strip`)

Revert bumps to 18.1.{7,8}

Author: grendello

build-common.cmd

@@ -6,7 +6,5 @@ set HOST_ARTIFACTS_DIR=%ARTIFACTS_DIR%\%HOST%
 set HOST_ARTIFACTS_BIN_DIR=%HOST_ARTIFACTS_DIR%\bin
 set CMAKE_VS_GENERATOR=Visual Studio 17 2022
 set MSVC_RUNTIME_LIBRARY="MultiThreaded"
-set CXXFLAGS=/Qspectre /sdl /guard:cf
-set CFLAGS=/Qspectre /sdl /guard:cf
 
 mkdir %HOST_ARTIFACTS_BIN_DIR%

build-llvm.cmd

@@ -11,6 +11,7 @@ set HOST_BUILD_DIR=%BUILD_DIR%\%HOST%\llvm
 set HOST_BIN_DIR=%HOST_BUILD_DIR%\Release\bin
 
 set LLVM_VERSION_FILE=%HOST_ARTIFACTS_DIR%\llvm-version.txt
+set CXXFLAGS="/Qspectre /sdl /guard:cf"
 
 if exist %HOST_BUILD_DIR% (rmdir /S /Q %HOST_BUILD_DIR%)
 mkdir %HOST_BUILD_DIR%
@@ -43,8 +44,6 @@ cmake -G "%CMAKE_VS_GENERATOR%" -A x64 ^
  -DLLVM_ENABLE_TERMINFO=OFF ^
  -DLLVM_ENABLE_THREADS=OFF ^
  -DLLVM_ENABLE_ZLIB=OFF ^
- -DLLVM_ENABLE_ZSTD=OFF ^
- -DLLVM_USE_STATIC_ZSTD=ON ^
  -DLLVM_INCLUDE_BENCHMARKS=OFF ^
  -DLLVM_INCLUDE_EXAMPLES=OFF ^
  -DLLVM_INCLUDE_TESTS=OFF ^

build-llvm.sh

@@ -46,7 +46,6 @@ function configure()
 		  -DLLVM_ENABLE_THREADS=OFF \
 		  -DLLVM_ENABLE_ZLIB=OFF \
 		  -DLLVM_ENABLE_ZSTD=OFF \
-		  -DLLVM_USE_STATIC_ZSTD=ON \
 		  -DLLVM_INCLUDE_BENCHMARKS=OFF \
 		  -DLLVM_INCLUDE_EXAMPLES=OFF \
 		  -DLLVM_INCLUDE_TESTS=OFF \

build-tools/automation/azure-pipelines.yml

@@ -113,7 +113,7 @@ extends:
             lsb-release patchutils diffstat xz-utils python3-dev libedit-dev libncurses5-dev swig
             python3-six python3-sphinx binutils-dev libxml2-dev libjsoncpp-dev pkg-config lcov
             procps help2man zlib1g-dev g++-multilib libjs-mathjax python3-recommonmark libpfm4-dev
-            python3-setuptools libz3-dev ccache libzstd-dev
+            python3-setuptools libz3-dev ccache
           displayName: Install LLVM build dependencies
 
         - script: sudo apt-get -f -u install mingw-w64 libz-mingw-w64-dev
@@ -171,7 +171,7 @@ extends:
             export HOMEBREW_NO_INSTALL_UPGRADE=1 && brew install cmake ninja ccache
           displayName: Install LLVM build dependencies
 
-        - script: export HOMEBREW_NO_INSTALL_UPGRADE=1 && brew install make xz zstd
+        - script: export HOMEBREW_NO_INSTALL_UPGRADE=1 && brew install make xz
           displayName: Install Xamarin.Android Utilities build dependencies
 
         - script: bash ./build-llvm.sh

external/llvm

@@ -1,6 +1,6 @@
-@echo off
-setlocal
-set BINARIES_DIRECTORY=%~dp0
-
-set "BINARIES_DIRECTORY=" && "%BINARIES_DIRECTORY%llvm-objcopy.exe" %*
-if not ERRORLEVEL 0 exit /b %errorlevel%
+@echo off
+setlocal
+set BINARIES_DIRECTORY=%~dp0
+
+set "BINARIES_DIRECTORY=" && "%BINARIES_DIRECTORY%llvm-objcopy.exe" %*
+if not ERRORLEVEL 0 exit /b %errorlevel%