diff options
| author | johnthagen <johnthagen@users.noreply.github.com> | 2017-10-16 17:56:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-16 17:56:12 -0400 |
| commit | bd8497884c2863a10b6d67855bd90d40783ce2da (patch) | |
| tree | 5fe9ffe7f65dbea1130217b5136264d4dbc7b513 /src/rustllvm/RustWrapper.cpp | |
| parent | 49a73d0901a60b1b77452b92372fd8629f636c2a (diff) | |
| parent | 4e9527cf6f2d3749554d07a96fe14967f5470ef6 (diff) | |
| download | rust-bd8497884c2863a10b6d67855bd90d40783ce2da.tar.gz rust-bd8497884c2863a10b6d67855bd90d40783ce2da.zip | |
Merge branch 'master' into future_imports
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) { |