Skip to content

Commit c85f307

Browse files
committed
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.
2 parents acfcb15 + 5b2edcd commit c85f307

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/rustllvm/ExecutionEngineWrapper.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ using namespace llvm::sys;
1717
using namespace llvm::object;
1818

1919
// libmorestack is not used on Windows
20-
#ifndef _WIN32
20+
#if !defined(_WIN32) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__Bitrig__)
2121
extern "C" void __morestack(void);
2222

2323
static void* morestack_addr() {
@@ -35,7 +35,7 @@ class RustJITMemoryManager : public SectionMemoryManager
3535

3636
uint64_t getSymbolAddress(const std::string &Name) override
3737
{
38-
#ifndef _WIN32
38+
#if !defined(_WIN32) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__Bitrig__)
3939
if (Name == "__morestack" || Name == "___morestack")
4040
return reinterpret_cast<uint64_t>(__morestack);
4141
if (Name == "__morestack_addr" || Name == "___morestack_addr")

0 commit comments

Comments
 (0)