Skip to content

fixes __morestack symbol problem on BSDs #26197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 1 commit into from
Jun 11, 2015
+2 −2
Merged

fixes __morestack symbol problem on BSDs #26197

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/rustllvm/ExecutionEngineWrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ using namespace llvm::sys;
using namespace llvm::object;

// libmorestack is not used on Windows
Copy link
Contributor

@tamird tamird Jun 11, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this comment needs an update?

#ifndef _WIN32
#if !defined(_WIN32) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__Bitrig__)
extern "C" void __morestack(void);

static void* morestack_addr() {
Expand All @@ -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")
Expand Down