diff options
| author | bors <bors@rust-lang.org> | 2015-06-11 14:57:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-06-11 14:57:13 +0000 |
| commit | c85f30736913cf42549d8e0fd40049b346b4cec4 (patch) | |
| tree | 04eb84144b5d3ecf87a5051b64065ad10dfe11e4 /src/rustllvm/ExecutionEngineWrapper.cpp | |
| parent | acfcb15e0999046bd27801e16b7c5cda42689e10 (diff) | |
| parent | 5b2edcdd6ee87b09e42422dedfed9a0828ae412e (diff) | |
| download | rust-c85f30736913cf42549d8e0fd40049b346b4cec4.tar.gz rust-c85f30736913cf42549d8e0fd40049b346b4cec4.zip | |
Auto merge of #26197 - dhuseby:fixing_morestack_breakage, r=brson
Revision 021e483 broke the BSD builds. This fixes it for Bitrig and probably the others.
Diffstat (limited to 'src/rustllvm/ExecutionEngineWrapper.cpp')
| -rw-r--r-- | src/rustllvm/ExecutionEngineWrapper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rustllvm/ExecutionEngineWrapper.cpp b/src/rustllvm/ExecutionEngineWrapper.cpp index e37ede82bb5..50551405383 100644 --- a/src/rustllvm/ExecutionEngineWrapper.cpp +++ b/src/rustllvm/ExecutionEngineWrapper.cpp @@ -17,7 +17,7 @@ using namespace llvm::sys; using namespace llvm::object; // libmorestack is not used on Windows -#ifndef _WIN32 +#if !defined(_WIN32) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__Bitrig__) extern "C" void __morestack(void); static void* morestack_addr() { @@ -35,7 +35,7 @@ class RustJITMemoryManager : public SectionMemoryManager uint64_t getSymbolAddress(const std::string &Name) override { -#ifndef _WIN32 +#if !defined(_WIN32) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__Bitrig__) if (Name == "__morestack" || Name == "___morestack") return reinterpret_cast<uint64_t>(__morestack); if (Name == "__morestack_addr" || Name == "___morestack_addr") |