Skip to content

Commit 4721b6e

Browse files
authored
Update LLVM from 13.0.1 to 14.0.6 (#8031)
Full set of mutually exclusive choices for upgrading LLVM: - #8031 (you are here) - #8035 - #8036 - #8034 - #8038 - #8039 - #8033 Alternative to #8028. Required some minor changes due to these upstream commits: - llvm/llvm-project@e463b69 - llvm/llvm-project@89b5706
1 parent 7cd8130 commit 4721b6e

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

cmake/LLVM.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ function(fetch_or_build_slang_llvm)
6060
endif()
6161
endif()
6262
elseif(SLANG_SLANG_LLVM_FLAVOR STREQUAL "USE_SYSTEM_LLVM")
63-
find_package(LLVM 13.0 REQUIRED CONFIG)
63+
find_package(LLVM 14.0 REQUIRED CONFIG)
6464
find_package(Clang REQUIRED CONFIG)
6565

6666
llvm_target_from_components(llvm-dep filecheck native orcjit)
@@ -108,7 +108,7 @@ function(fetch_or_build_slang_llvm)
108108
endif()
109109

110110
# TODO: Put a check here that libslang-llvm.so doesn't have a 'NEEDED'
111-
# directive for libLLVM-13.so, it's almost certainly going to break at
111+
# directive for libLLVM-14.so, it's almost certainly going to break at
112112
# runtime in surprising ways when linked alongside Mesa (or anything else
113113
# pulling in libLLVM.so)
114114
endif()

docs/building.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ There are several options for getting llvm-support:
219219
the case that a prebuilt binary can't be found then the build will proceed
220220
as though `DISABLE` was chosen
221221
- Use a system supplied LLVM: `-DSLANG_SLANG_LLVM_FLAVOR=USE_SYSTEM_LLVM`, you
222-
must have llvm-13.0 and a matching libclang installed. It's important that
222+
must have llvm-14.0 and a matching libclang installed. It's important that
223223
either:
224224
- You don't end up linking to a dynamic libllvm.so, this will almost
225225
certainly cause multiple versions of LLVM to be loaded at runtime,

external/build-llvm.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ $null = Register-EngineEvent PowerShell.Exiting -Action $cleanup
5555

5656
# Default values
5757
$repo = "https://github.com/llvm/llvm-project"
58-
$branch = "llvmorg-13.0.1"
58+
$branch = "llvmorg-14.0.6"
5959
$sourceDir = $tempDir.FullName
6060
$installPrefix = ""
6161
$config = "Release"

external/build-llvm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ trap cleanup EXIT SIGHUP SIGINT SIGTERM
5454
# Options and parsing
5555
#
5656
repo=https://github.com/llvm/llvm-project
57-
branch=llvmorg-13.0.1
57+
branch=llvmorg-14.0.6
5858
source_dir=$temp_dir
5959
install_prefix=
6060
config=Release

source/slang-llvm/slang-llvm.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include "llvm/Support/Path.h"
2929
#include "llvm/Support/Process.h"
3030
#include "llvm/Support/Signals.h"
31-
#include "llvm/Support/TargetRegistry.h"
3231
#include "llvm/Support/TargetSelect.h"
3332
#include "llvm/Support/TimeProfiler.h"
3433
#include "llvm/Support/Timer.h"
@@ -239,12 +238,12 @@ void* LLVMJITSharedLibrary::findSymbolAddressByName(char const* name)
239238

240239
static void _ensureSufficientStack() {}
241240

242-
static void _llvmErrorHandler(void* userData, const std::string& message, bool genCrashDiag)
241+
static void _llvmErrorHandler(void* userData, const char* message, bool genCrashDiag)
243242
{
244243
// DiagnosticsEngine& diags = *static_cast<DiagnosticsEngine*>(userData);
245244
// diags.Report(diag::err_fe_error_backend) << message;
246245

247-
printf("Clang/LLVM fatal error: %s\n", message.c_str());
246+
printf("Clang/LLVM fatal error: %s\n", message);
248247

249248
// Run the interrupt handlers to make sure any special cleanups get done, in
250249
// particular that we remove files registered with RemoveFileOnSignal.

0 commit comments

Comments
 (0)