Remove now unused arguments from TargetRegistry::lookupTarget.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@77950 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/ExecutionEngine/JIT/TargetSelect.cpp b/lib/ExecutionEngine/JIT/TargetSelect.cpp
index 55ff441..c30a698 100644
--- a/lib/ExecutionEngine/JIT/TargetSelect.cpp
+++ b/lib/ExecutionEngine/JIT/TargetSelect.cpp
@@ -51,10 +51,7 @@
std::string Error;
const Target *TheTarget =
- TargetRegistry::lookupTarget(TheTriple.getTriple(),
- /*FallbackToHost=*/false,
- /*RequireJIT=*/false,
- Error);
+ TargetRegistry::lookupTarget(TheTriple.getTriple(), Error);
if (TheTarget == 0) {
if (ErrorStr)
*ErrorStr = Error;
diff --git a/lib/Support/TargetRegistry.cpp b/lib/Support/TargetRegistry.cpp
index c60322b..79f30a7 100644
--- a/lib/Support/TargetRegistry.cpp
+++ b/lib/Support/TargetRegistry.cpp
@@ -20,8 +20,6 @@
}
const Target *TargetRegistry::lookupTarget(const std::string &TT,
- bool FallbackToHost,
- bool RequireJIT,
std::string &Error) {
// Provide special warning when no targets are initialized.
if (begin() == end()) {
@@ -31,9 +29,6 @@
const Target *Best = 0, *EquallyBest = 0;
unsigned BestQuality = 0;
for (iterator it = begin(), ie = end(); it != ie; ++it) {
- if (RequireJIT && !it->hasJIT())
- continue;
-
if (unsigned Qual = it->TripleMatchQualityFn(TT)) {
if (!Best || Qual > BestQuality) {
Best = &*it;
@@ -44,15 +39,6 @@
}
}
- // FIXME: Hack. If we only have an extremely weak match and the client
- // requested to fall back to the host, then ignore it and try again.
- if (BestQuality == 1 && FallbackToHost)
- Best = 0;
-
- // Fallback to the host triple if we didn't find anything.
- if (!Best && FallbackToHost)
- return lookupTarget(sys::getHostTriple(), false, RequireJIT, Error);
-
if (!Best) {
Error = "No available targets are compatible with this triple";
return 0;
@@ -92,3 +78,14 @@
T.HasJIT = HasJIT;
}
+const Target *TargetRegistry::getClosestTargetForJIT(std::string &Error) {
+ const Target *TheTarget = lookupTarget(sys::getHostTriple(), Error);
+
+ if (TheTarget && !TheTarget->hasJIT()) {
+ Error = "No JIT compatible target available for this host";
+ return 0;
+ }
+
+ return TheTarget;
+}
+
diff --git a/lib/Target/CBackend/CBackend.cpp b/lib/Target/CBackend/CBackend.cpp
index c014006..7a43233 100644
--- a/lib/Target/CBackend/CBackend.cpp
+++ b/lib/Target/CBackend/CBackend.cpp
@@ -3186,11 +3186,7 @@
Triple = llvm::sys::getHostTriple();
std::string E;
- const Target *Match =
- TargetRegistry::lookupTarget(Triple,
- /*FallbackToHost=*/false,
- /*RequireJIT=*/false,
- E);
+ const Target *Match = TargetRegistry::lookupTarget(Triple, E);
if (Match) {
// Per platform Target Machines don't exist, so create it;
// this must be done only once.