diff options
author | Ayke van Laethem <[email protected]> | 2022-02-05 14:27:50 +0100 |
---|---|---|
committer | Ron Evans <[email protected]> | 2022-04-23 08:45:46 +0200 |
commit | 6b31ee1e9392a463b536735081cc496405929882 (patch) | |
tree | 2eeb92533ccb7269a2e013b3feb9520c004598d1 /builder/cc1as.cpp | |
parent | cad6a57077c7887025ba532a03f41d6ad78daa72 (diff) | |
download | tinygo-6b31ee1e9392a463b536735081cc496405929882.tar.gz tinygo-6b31ee1e9392a463b536735081cc496405929882.zip |
all: update to LLVM 14
Switch over to LLVM 14 for static builds. Keep using LLVM 13 for regular
builds for now.
This uses a branch of the upstream Espressif branch to fix an issue,
see: https://github.com/espressif/llvm-project/pull/59
Diffstat (limited to 'builder/cc1as.cpp')
-rw-r--r-- | builder/cc1as.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/builder/cc1as.cpp b/builder/cc1as.cpp index ece541244..115001213 100644 --- a/builder/cc1as.cpp +++ b/builder/cc1as.cpp @@ -38,6 +38,7 @@ #include "llvm/MC/MCStreamer.h" #include "llvm/MC/MCSubtargetInfo.h" #include "llvm/MC/MCTargetOptions.h" +#include "llvm/MC/TargetRegistry.h" #include "llvm/Option/Arg.h" #include "llvm/Option/ArgList.h" #include "llvm/Option/OptTable.h" @@ -51,7 +52,6 @@ #include "llvm/Support/Process.h" #include "llvm/Support/Signals.h" #include "llvm/Support/SourceMgr.h" -#include "llvm/Support/TargetRegistry.h" #include "llvm/Support/TargetSelect.h" #include "llvm/Support/Timer.h" #include "llvm/Support/raw_ostream.h" @@ -120,7 +120,6 @@ bool AssemblerInvocation::CreateFromArgs(AssemblerInvocation &Opts, llvm::StringSwitch<llvm::DebugCompressionType>(A->getValue()) .Case("none", llvm::DebugCompressionType::None) .Case("zlib", llvm::DebugCompressionType::Z) - .Case("zlib-gnu", llvm::DebugCompressionType::GNU) .Default(llvm::DebugCompressionType::None); } @@ -382,7 +381,7 @@ static bool ExecuteAssemblerImpl(AssemblerInvocation &Opts, T, Ctx, std::move(MAB), std::move(OW), std::move(CE), *STI, Opts.RelaxAll, Opts.IncrementalLinkerCompatible, /*DWARFMustBeAtTheEnd*/ true)); - Str.get()->InitSections(Opts.NoExecStack); + Str.get()->initSections(Opts.NoExecStack, *STI); } // When -fembed-bitcode is passed to clang_as, a 1-byte marker @@ -442,7 +441,7 @@ bool ExecuteAssembler(AssemblerInvocation &Opts, return Failed; } -static void LLVMErrorHandler(void *UserData, const std::string &Message, +static void LLVMErrorHandler(void *UserData, const char *Message, bool GenCrashDiag) { DiagnosticsEngine &Diags = *static_cast<DiagnosticsEngine*>(UserData); |