6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-08 18:30:04 +00:00
Code Issues Projects Releases Wiki Activity

Replace the interim lli build fix with something cleaner

Browse Source 
Eliminates the LLI_BUILDING_CHILD build hack from r199885.

Also add a FIXME to remove code that tricks the tests into passing when the
feature fails to work. Please don't do stuff like this, the tests exist for a
reason!

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@199929 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Alp Toker 2014-01-23 19:57:16 +00:00
parent ebcaef4340
commit fe32bb7833
5 changed files with 15 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/lli/ChildTarget/CMakeLists.txt
View File

@ -1,5 +1,4 @@
set(LLVM_LINK_COMPONENTS support)
add_definitions(-DLLI_BUILDING_CHILD)
add_llvm_executable(lli-child-target
ChildTarget.cpp

2
tools/lli/ChildTarget/Makefile
View File

@ -14,8 +14,6 @@ include $(LEVEL)/Makefile.config
LINK_COMPONENTS := support
CXXFLAGS += -DLLI_BUILDING_CHILD
SOURCES := ChildTarget.cpp ../RemoteTarget.cpp
include $(LLVM_SRC_ROOT)/Makefile.rules

25
tools/lli/RemoteTarget.cpp
View File

@ -22,31 +22,6 @@
using namespace llvm;
#ifndef LLI_BUILDING_CHILD
// Static methods
RemoteTarget *RemoteTarget::createRemoteTarget() {
return new RemoteTarget;
}
RemoteTarget *RemoteTarget::createExternalRemoteTarget(std::string &ChildName) {
#ifdef LLVM_ON_UNIX
return new RemoteTargetExternal(ChildName);
#else
return 0;
#endif
}
bool RemoteTarget::hostSupportsExternalRemoteTarget() {
#ifdef LLVM_ON_UNIX
return true;
#else
return false;
#endif
}
#endif
////////////////////////////////////////////////////////////////////////////////
// Simulated remote execution
//

5
tools/lli/RemoteTarget.h
View File

@ -111,11 +111,6 @@ public:
RemoteTarget() : IsRunning(false), ErrorMsg("") {}
virtual ~RemoteTarget() { if (IsRunning) stop(); }
// Create an instance of the system-specific remote target class.
static RemoteTarget *createRemoteTarget();
static RemoteTarget *createExternalRemoteTarget(std::string &ChildName);
static bool hostSupportsExternalRemoteTarget();
private:
// Main processing function for the remote target process. Command messages
// are received on file descriptor CmdFD and responses come back on OutFD.

27
tools/lli/lli.cpp
View File

@ -17,6 +17,7 @@
#include "llvm/IR/LLVMContext.h"
#include "RemoteMemoryManager.h"
#include "RemoteTarget.h"
#include "RemoteTargetExternal.h"
#include "llvm/ADT/Triple.h"
#include "llvm/Bitcode/ReaderWriter.h"
#include "llvm/CodeGen/LinkAllCodegenComponents.h"
@ -663,21 +664,23 @@ int main(int argc, char **argv, char * const *envp) {
OwningPtr<RemoteTarget> Target;
if (!ChildExecPath.empty()) { // Remote execution on a child process
if (!RemoteTarget::hostSupportsExternalRemoteTarget()) {
errs() << "Warning: host does not support external remote targets.\n"
<< " Defaulting to simulated remote execution\n";
Target.reset(RemoteTarget::createRemoteTarget());
} else {
if (!sys::fs::can_execute(ChildExecPath)) {
errs() << "Unable to find usable child executable: '" << ChildExecPath
<< "'\n";
return -1;
}
Target.reset(RemoteTarget::createExternalRemoteTarget(ChildExecPath));
#ifndef LLVM_ON_UNIX
// FIXME: Remove this pointless fallback mode which causes tests to "pass"
// on platforms where they should XFAIL.
errs() << "Warning: host does not support external remote targets.\n"
<< " Defaulting to simulated remote execution\n";
Target.reset(new RemoteTarget);
#else
if (!sys::fs::can_execute(ChildExecPath)) {
errs() << "Unable to find usable child executable: '" << ChildExecPath
<< "'\n";
return -1;
}
Target.reset(new RemoteTargetExternal(ChildExecPath));
#endif
} else {
// No child process name provided, use simulated remote execution.
Target.reset(RemoteTarget::createRemoteTarget());
Target.reset(new RemoteTarget);
}
// Give the memory manager a pointer to our remote target interface object.