mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-12-13 20:32:21 +00:00
Move PrependMainExecutablePath next to its only user.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@183980 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
d86dd4a29d
commit
c65aba032e
@ -19,7 +19,6 @@
|
||||
|
||||
namespace llvm {
|
||||
class raw_ostream;
|
||||
namespace sys { class Path; }
|
||||
|
||||
/// Determine if the raw_ostream provided is connected to a terminal. If so,
|
||||
/// generate a warning message to errs() advising against display of bitcode
|
||||
@ -30,15 +29,6 @@ bool CheckBitcodeOutputToConsole(
|
||||
bool print_warning = true ///< Control whether warnings are printed
|
||||
);
|
||||
|
||||
/// PrependMainExecutablePath - Prepend the path to the program being executed
|
||||
/// to \p ExeName, given the value of argv[0] and the address of main()
|
||||
/// itself. This allows us to find another LLVM tool if it is built in the same
|
||||
/// directory. An empty string is returned on error; note that this function
|
||||
/// just mainpulates the path and doesn't check for executability.
|
||||
/// @brief Find a named executable.
|
||||
sys::Path PrependMainExecutablePath(const std::string &ExeName,
|
||||
const char *Argv0, void *MainAddr);
|
||||
|
||||
} // End llvm namespace
|
||||
|
||||
#endif
|
||||
|
@ -13,7 +13,6 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#include "llvm/Support/SystemUtils.h"
|
||||
#include "llvm/Support/PathV1.h"
|
||||
#include "llvm/Support/Process.h"
|
||||
#include "llvm/Support/Program.h"
|
||||
#include "llvm/Support/raw_ostream.h"
|
||||
@ -32,25 +31,3 @@ bool llvm::CheckBitcodeOutputToConsole(raw_ostream &stream_to_check,
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/// PrependMainExecutablePath - Prepend the path to the program being executed
|
||||
/// to \p ExeName, given the value of argv[0] and the address of main()
|
||||
/// itself. This allows us to find another LLVM tool if it is built in the same
|
||||
/// directory. An empty string is returned on error; note that this function
|
||||
/// just mainpulates the path and doesn't check for executability.
|
||||
/// @brief Find a named executable.
|
||||
sys::Path llvm::PrependMainExecutablePath(const std::string &ExeName,
|
||||
const char *Argv0, void *MainAddr) {
|
||||
// Check the directory that the calling program is in. We can do
|
||||
// this if ProgramPath contains at least one / character, indicating that it
|
||||
// is a relative path to the executable itself.
|
||||
sys::Path Result = sys::Path::GetMainExecutable(Argv0, MainAddr);
|
||||
Result.eraseComponent();
|
||||
|
||||
if (!Result.isEmpty()) {
|
||||
Result.appendComponent(ExeName);
|
||||
Result.appendSuffix(sys::Path::GetEXESuffix());
|
||||
}
|
||||
|
||||
return Result;
|
||||
}
|
||||
|
@ -230,6 +230,28 @@ int LLI::ExecuteProgram(const std::string &Bitcode,
|
||||
|
||||
void AbstractInterpreter::anchor() { }
|
||||
|
||||
/// Prepend the path to the program being executed
|
||||
/// to \p ExeName, given the value of argv[0] and the address of main()
|
||||
/// itself. This allows us to find another LLVM tool if it is built in the same
|
||||
/// directory. An empty string is returned on error; note that this function
|
||||
/// just mainpulates the path and doesn't check for executability.
|
||||
/// @brief Find a named executable.
|
||||
static sys::Path PrependMainExecutablePath(const std::string &ExeName,
|
||||
const char *Argv0, void *MainAddr) {
|
||||
// Check the directory that the calling program is in. We can do
|
||||
// this if ProgramPath contains at least one / character, indicating that it
|
||||
// is a relative path to the executable itself.
|
||||
sys::Path Result = sys::Path::GetMainExecutable(Argv0, MainAddr);
|
||||
Result.eraseComponent();
|
||||
|
||||
if (!Result.isEmpty()) {
|
||||
Result.appendComponent(ExeName);
|
||||
Result.appendSuffix(sys::Path::GetEXESuffix());
|
||||
}
|
||||
|
||||
return Result;
|
||||
}
|
||||
|
||||
// LLI create method - Try to find the LLI executable
|
||||
AbstractInterpreter *AbstractInterpreter::createLLI(const char *Argv0,
|
||||
std::string &Message,
|
||||
|
Loading…
Reference in New Issue
Block a user