diff options
| author |   patrick <patrick@openbsd.org> | 2017-01-24 08:32:59 +0000 |
|---|---|---|
| committer | patrick <patrick@openbsd.org> | 2017-01-24 08:32:59 +0000 |
| commit | 53d771aafdbe5b919f264f53cba3788e2c4cffd2 (patch) | |
| tree | 7eca39498be0ff1e3a6daf583cd9ca5886bb2636 /gnu/llvm/lib/Linker/LinkModules.cpp | |
| parent | In preparation of compiling our kernels with -ffreestanding, explicitly map (diff) | |
| download | wireguard-openbsd-53d771aafdbe5b919f264f53cba3788e2c4cffd2.tar.xz wireguard-openbsd-53d771aafdbe5b919f264f53cba3788e2c4cffd2.zip | |
Import LLVM 4.0.0 rc1 including clang and lld to help the current
development effort on OpenBSD/arm64.
Diffstat (limited to 'gnu/llvm/lib/Linker/LinkModules.cpp')
| -rw-r--r-- | gnu/llvm/lib/Linker/LinkModules.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gnu/llvm/lib/Linker/LinkModules.cpp b/gnu/llvm/lib/Linker/LinkModules.cpp index fae9c95ebe8..cf2c4ccf523 100644 --- a/gnu/llvm/lib/Linker/LinkModules.cpp +++ b/gnu/llvm/lib/Linker/LinkModules.cpp @@ -582,7 +582,9 @@ bool ModuleLinker::run() { if (Error E = Mover.move(std::move(SrcM), ValuesToLink.getArrayRef(), [this](GlobalValue &GV, IRMover::ValueAdder Add) { addLazyFor(GV, Add); - })) { + }, + /* LinkModuleInlineAsm */ !isPerformingImport(), + /* IsPerformingImport */ isPerformingImport())) { handleAllErrors(std::move(E), [&](ErrorInfoBase &EIB) { DstM.getContext().diagnose(LinkDiagnosticInfo(DS_Error, EIB.message())); HasErrors = true; |