Bump to LLVM 18.1.7 (#29)

Changes: https://discourse.llvm.org/t/18-1-7-released/79433

The LLVM release doesn't contain any changes that affect us directly, we're updating the version just to
track the latest release.

However, taking this opportunity to add `llvm-objcopy` to the set of tools - it will be used at some point
to separate debugging information from the shared libraries we build at application build time.

Author: grendello

.gdn/.gdnsuppress

@@ -56,6 +56,17 @@
       ],
       "justification": "Unable to resolve BA2007 identified in external LLVM CMake configuration.",
       "createdDate": "2024-02-15 00:04:36Z"
+    },
+    "02dc21533e1f4f27353d0c34284a2ebf6d7357c7f7d0f9879fed4993728069e3": {
+      "signature": "02dc21533e1f4f27353d0c34284a2ebf6d7357c7f7d0f9879fed4993728069e3",
+      "alternativeSignatures": [
+        "6b50835be7f05c09d9c68d8cc7e3a0e3316c84e040b919b2ab7dbc4e228323fe"
+      ],
+      "memberOf": [
+        "default"
+      ],
+      "justification": "Unable to resolve BA2007 identified in external LLVM CMake configuration.",
+      "createdDate": "2024-06-11 17:44:37Z"
     }
   }
 }

build-common.cmd

@@ -6,5 +6,7 @@ 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

@@ -4,14 +4,13 @@ set SOURCE_DIR=%MY_DIR%external\llvm\llvm
 
 set PROJECTS=lld
 set TARGETS=X86;ARM;AArch64
-set BINARIES=llvm-mc.exe llvm-strip.exe lld.exe llc.exe
+set BINARIES=llvm-mc.exe llvm-objcopy.exe llvm-strip.exe lld.exe llc.exe
 set PDBS=llvm-mc.pdb llvm-objcopy.pdb llvm-strip.pdb lld.pdb llc.pdb
 
 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%
@@ -44,6 +43,8 @@ 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 ^
@@ -68,7 +69,7 @@ IF %ERRORLEVEL% GEQ 1 EXIT /B 4
 msbuild /p:Configuration=Release /m tools\llc\llc.vcxproj
 IF %ERRORLEVEL% GEQ 1 EXIT /B 5
 
-move %HOST_BIN_DIR%\llvm-objcopy.exe %HOST_BIN_DIR%\llvm-strip.exe
+copy %HOST_BIN_DIR%\llvm-objcopy.exe %HOST_BIN_DIR%\llvm-strip.exe
 IF %ERRORLEVEL% GEQ 1 EXIT /B 6
 
 copy %HOST_BIN_DIR%\llvm-objcopy.pdb %HOST_BIN_DIR%\llvm-strip.pdb

build-llvm.sh

@@ -46,6 +46,7 @@ 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 \
@@ -96,7 +97,7 @@ function build()
 	ninja -j${JOBS} lld
 	ninja -j${JOBS} llc
 
-	mv "${HOST_BIN_DIR}/llvm-objcopy" "${HOST_BIN_DIR}/llvm-strip"
+	cp -P -a "${HOST_BIN_DIR}/llvm-objcopy" "${HOST_BIN_DIR}/llvm-strip"
 	grep 'CMAKE_PROJECT_VERSION:' "${MY_BUILD_DIR}/CMakeCache.txt" | cut -d '=' -f 2 > "${LLVM_VERSION_FILE}"
 
 	for b in ${LLVM_BINARIES}; do

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
+            python3-setuptools libz3-dev ccache libzstd-dev
           displayName: Install LLVM build dependencies
 
         - script: sudo apt-get -f -u install mingw-w64 libz-mingw-w64-dev
@@ -169,7 +169,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
+        - script: export HOMEBREW_NO_INSTALL_UPGRADE=1 && brew install make xz zstd
           displayName: Install Xamarin.Android Utilities build dependencies
 
         - script: bash ./build-llvm.sh

common.sh

@@ -70,7 +70,7 @@ ARTIFACTS_DIR="${MY_DIR}/artifacts"
 HOST_ARTIFACTS_DIR="${ARTIFACTS_DIR}/${HOST}"
 HOST_ARTIFACTS_BIN_DIR="${HOST_ARTIFACTS_DIR}/bin"
 HOST_ARTIFACTS_LIB_DIR="${HOST_ARTIFACTS_DIR}/lib"
-LLVM_BINARIES="llvm-mc llvm-strip lld llc"
+LLVM_BINARIES="llvm-mc llvm-objcopy llvm-strip lld llc"
 LLVM_PREFIXED_BINARIES="$(make_prefixed_binaries strip) $(make_prefixed_binaries ld)"
 XA_UTILS_BINARIES="as"
 XA_UTILS_PREFIXED_BINARIES="$(make_prefixed_binaries as)"

external/llvm

@@ -65,10 +65,12 @@ function prepare()
 
 		cp -P -a "${artifacts_source_bin}/llvm-objcopy.pdb" "${artifacts_dest_bin}/llvm-objcopy.pdb"
 		cp -P -a "${artifacts_source_bin}/lld.pdb" "${artifacts_dest_bin}/lld.pdb"
+		make_windows_wrapper_scripts "scripts/llvm-objcopy.cmd.in" "${artifacts_source_bin}" "objcopy"
 		make_windows_wrapper_scripts "scripts/llvm-strip.cmd.in" "${artifacts_source_bin}" "strip"
 		make_windows_wrapper_scripts "scripts/gas.cmd.in" "${artifacts_source_bin}" "as"
 		make_windows_wrapper_scripts "scripts/ld.cmd.in" "${artifacts_source_bin}" "ld"
 	else
+		make_unix_wrapper_scripts "scripts/llvm-objcopy.sh" "${artifacts_source_bin}" "objcopy"
 		make_unix_wrapper_scripts "scripts/llvm-strip.sh" "${artifacts_source_bin}" "strip"
 		make_unix_wrapper_scripts "scripts/gas.sh" "${artifacts_source_bin}" "as"
 		make_unix_wrapper_scripts "scripts/ld.sh" "${artifacts_source_bin}" "ld"

package.sh

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

scripts/llvm-objcopy.cmd.in

@@ -0,0 +1,3 @@
+#!/bin/bash -e
+MY_DIR="$(cd $(dirname $0);pwd)"
+exec "${MY_DIR}"/llvm-objcopy "$@"