mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2026-04-20 00:20:11 +00:00
Change to use GetAddressOfSymbol instead of dlsym.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@9012 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -16,6 +16,7 @@
|
||||
#include "llvm/Target/TargetData.h"
|
||||
#include "Support/Debug.h"
|
||||
#include "Support/Statistic.h"
|
||||
#include "Support/DynamicLinker.h"
|
||||
#include "Config/dlfcn.h"
|
||||
|
||||
Statistic<> NumInitBytes("lli", "Number of bytes of global vars initialized");
|
||||
@@ -339,14 +340,9 @@ void ExecutionEngine::emitGlobals() {
|
||||
DEBUG(std::cerr << "Global '" << I->getName() << "' -> "
|
||||
<< (void*)GlobalAddress[I] << "\n");
|
||||
} else {
|
||||
// On Sparc, RTLD_SELF is already defined and it's not zero
|
||||
// Linux/x86 wants to use a 0, other systems may differ
|
||||
#ifndef RTLD_SELF
|
||||
#define RTLD_SELF 0
|
||||
#endif
|
||||
// External variable reference, try to use dlsym to get a pointer to it in
|
||||
// the LLI image.
|
||||
if (void *SymAddr = dlsym(RTLD_SELF, I->getName().c_str()))
|
||||
// External variable reference. Try to use the dynamic loader to
|
||||
// get a pointer to it.
|
||||
if (void *SymAddr = GetAddressOfSymbol(I->getName().c_str()))
|
||||
GlobalAddress[I] = SymAddr;
|
||||
else {
|
||||
std::cerr << "Could not resolve external global address: "
|
||||
|
||||
Reference in New Issue
Block a user