File tree Expand file tree Collapse file tree 5 files changed +7
-8
lines changed Expand file tree Collapse file tree 5 files changed +7
-8
lines changed Original file line number Diff line number Diff line change @@ -60,7 +60,7 @@ function(fetch_or_build_slang_llvm)
60
60
endif ()
61
61
endif ()
62
62
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)
64
64
find_package (Clang REQUIRED CONFIG)
65
65
66
66
llvm_target_from_components(llvm-dep filecheck native orcjit)
@@ -108,7 +108,7 @@ function(fetch_or_build_slang_llvm)
108
108
endif ()
109
109
110
110
# 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
112
112
# runtime in surprising ways when linked alongside Mesa (or anything else
113
113
# pulling in libLLVM.so)
114
114
endif ()
Original file line number Diff line number Diff line change @@ -219,7 +219,7 @@ There are several options for getting llvm-support:
219
219
the case that a prebuilt binary can't be found then the build will proceed
220
220
as though ` DISABLE ` was chosen
221
221
- 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
223
223
either:
224
224
- You don't end up linking to a dynamic libllvm.so, this will almost
225
225
certainly cause multiple versions of LLVM to be loaded at runtime,
Original file line number Diff line number Diff line change @@ -55,7 +55,7 @@ $null = Register-EngineEvent PowerShell.Exiting -Action $cleanup
55
55
56
56
# Default values
57
57
$repo = " https://github.com/llvm/llvm-project"
58
- $branch = " llvmorg-13 .0.1 "
58
+ $branch = " llvmorg-14 .0.6 "
59
59
$sourceDir = $tempDir.FullName
60
60
$installPrefix = " "
61
61
$config = " Release"
Original file line number Diff line number Diff line change @@ -54,7 +54,7 @@ trap cleanup EXIT SIGHUP SIGINT SIGTERM
54
54
# Options and parsing
55
55
#
56
56
repo=https://github.com/llvm/llvm-project
57
- branch=llvmorg-13 .0.1
57
+ branch=llvmorg-14 .0.6
58
58
source_dir=$temp_dir
59
59
install_prefix=
60
60
config=Release
Original file line number Diff line number Diff line change 28
28
#include " llvm/Support/Path.h"
29
29
#include " llvm/Support/Process.h"
30
30
#include " llvm/Support/Signals.h"
31
- #include " llvm/Support/TargetRegistry.h"
32
31
#include " llvm/Support/TargetSelect.h"
33
32
#include " llvm/Support/TimeProfiler.h"
34
33
#include " llvm/Support/Timer.h"
@@ -239,12 +238,12 @@ void* LLVMJITSharedLibrary::findSymbolAddressByName(char const* name)
239
238
240
239
static void _ensureSufficientStack () {}
241
240
242
- static void _llvmErrorHandler (void * userData, const std::string& message, bool genCrashDiag)
241
+ static void _llvmErrorHandler (void * userData, const char * message, bool genCrashDiag)
243
242
{
244
243
// DiagnosticsEngine& diags = *static_cast<DiagnosticsEngine*>(userData);
245
244
// diags.Report(diag::err_fe_error_backend) << message;
246
245
247
- printf (" Clang/LLVM fatal error: %s\n " , message. c_str () );
246
+ printf (" Clang/LLVM fatal error: %s\n " , message);
248
247
249
248
// Run the interrupt handlers to make sure any special cleanups get done, in
250
249
// particular that we remove files registered with RemoveFileOnSignal.
You can’t perform that action at this time.
0 commit comments