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

Move GetEXESuffix to the one place it is used.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@184853 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2013-06-25 14:42:30 +00:00
parent deeb5724b8
commit 46fa7cf91a
4 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/llvm/Support/PathV1.h
View File

@ -104,12 +104,6 @@ namespace sys {
/// @brief Returns the current working directory.
static Path GetCurrentDirectory();
/// Return the suffix commonly used on file names that contain an
/// executable.
/// @returns The executable file suffix for the current platform.
/// @brief Return the executable file suffix.
static StringRef GetEXESuffix();
/// GetMainExecutable - Return the path to the main executable, given the
/// value of argv[0] from program startup and the address of main itself.
/// In extremis, this function may fail and return an empty path.

4
lib/Support/Unix/Path.inc
View File

@ -81,10 +81,6 @@ inline bool lastIsSlash(const std::string& path) {
namespace llvm {
using namespace sys;
StringRef Path::GetEXESuffix() {
return StringRef();
}
Path::Path(StringRef p)
: path(p) {}

4
lib/Support/Windows/Path.inc
View File

@ -42,10 +42,6 @@ static void FlipBackSlashes(std::string& s) {
namespace llvm {
namespace sys {
StringRef Path::GetEXESuffix() {
return "exe";
}
Path::Path(llvm::StringRef p)
: path(p) {
FlipBackSlashes(path);

8
tools/bugpoint/ToolRunner.cpp
View File

@ -234,6 +234,12 @@ int LLI::ExecuteProgram(const std::string &Bitcode,
void AbstractInterpreter::anchor() { }
#if defined(LLVM_ON_UNIX)
const char EXESuffix[] = "";
#elif defined (LLVM_ON_WIN32)
const char EXESuffix[] = "exe";
#endif
/// 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
@ -252,7 +258,7 @@ static std::string PrependMainExecutablePath(const std::string &ExeName,
if (!Result.empty()) {
SmallString<128> Storage = Result;
sys::path::append(Storage, ExeName);
sys::path::replace_extension(Storage, sys::Path::GetEXESuffix());
sys::path::replace_extension(Storage, EXESuffix);
return Storage.str();
}