diff options
| author | johnthagen <johnthagen@users.noreply.github.com> | 2017-10-11 07:33:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-11 07:33:46 -0400 |
| commit | 23a5fb811e3e0c76153c9161c7a6eedb2714b554 (patch) | |
| tree | 457cbc4e2d7f634750186f6fe200509ce71177b9 /src/rustllvm/RustWrapper.cpp | |
| parent | a263a78b28dd1cef60025b0681689d7b6188d693 (diff) | |
| parent | 264aafe0566e521bbc95bd3f44dae97591c9fd20 (diff) | |
| download | rust-23a5fb811e3e0c76153c9161c7a6eedb2714b554.tar.gz rust-23a5fb811e3e0c76153c9161c7a6eedb2714b554.zip | |
Merge branch 'master' into pep8-bootstrap
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
| -rw-r--r-- | src/rustllvm/RustWrapper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp index bc616f64881..20ea8d70302 100644 --- a/src/rustllvm/RustWrapper.cpp +++ b/src/rustllvm/RustWrapper.cpp @@ -57,7 +57,7 @@ static AtomicOrdering fromRust(LLVMAtomicOrdering Ordering) { llvm_unreachable("Invalid LLVMAtomicOrdering value!"); } -static char *LastError; +static LLVM_THREAD_LOCAL char *LastError; extern "C" LLVMMemoryBufferRef LLVMRustCreateMemoryBufferWithContentsOfFile(const char *Path) { |