averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move target configuration setup into CompilerInvocation.

Browse Source 
Without this, clients that don't use a CompilerInstance (like LLDB) won't
have target configuration options available.

Also, move minimum OS checking into the driver. This makes sure the check
happens early (and only once), and in general fits the philosophy of
allowing the frontend to use configurations that might be banned for users.

<rdar://problem/17688913>

Swift SVN r20701
This commit is contained in:
Jordan Rose
2014-07-29 21:48:59 +00:00
parent 18b81228d5
commit 0481b87ba5
14 changed files with 79 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
lib/Frontend/CompilerInvocation.cpp
View File

@@ -28,7 +28,7 @@ using namespace swift;
using namespace llvm::opt;
swift::CompilerInvocation::CompilerInvocation() {
IRGenOpts.Triple = llvm::sys::getDefaultTargetTriple();
setTargetTriple(llvm::sys::getDefaultTargetTriple());
}
void CompilerInvocation::setMainExecutablePath(StringRef Path) {
@@ -39,15 +39,11 @@ void CompilerInvocation::setMainExecutablePath(StringRef Path) {
setRuntimeResourcePath(LibPath.str());
}
void CompilerInvocation::setRuntimeResourcePath(StringRef Path) {
SearchPathOpts.RuntimeResourcePath = Path;
updateRuntimeLibraryPath();
}
void CompilerInvocation::updateRuntimeLibraryPath() {
static void updateRuntimeLibraryPath(SearchPathOptions &SearchPathOpts,
StringRef tripleStr) {
llvm::SmallString<128> LibPath(SearchPathOpts.RuntimeResourcePath);
llvm::Triple Triple(IRGenOpts.Triple);
llvm::Triple Triple{tripleStr};
llvm::sys::path::append(LibPath, getPlatformNameForTriple(Triple));
SearchPathOpts.RuntimeLibraryPath = LibPath.str();
@@ -56,9 +52,47 @@ void CompilerInvocation::updateRuntimeLibraryPath() {
SearchPathOpts.RuntimeLibraryImportPath = LibPath.str();
}
void CompilerInvocation::setRuntimeResourcePath(StringRef Path) {
SearchPathOpts.RuntimeResourcePath = Path;
updateRuntimeLibraryPath(SearchPathOpts, getTargetTriple());
}
static void updateTargetConfigurationOptions(LangOptions &LangOpts,
StringRef tripleStr) {
LangOpts.clearAllTargetConfigOptions();
llvm::Triple triple = llvm::Triple(tripleStr);
// Set the "os" target configuration.
if (triple.isMacOSX())
LangOpts.addTargetConfigOption("os", "OSX");
else if (triple.isiOS())
LangOpts.addTargetConfigOption("os", "iOS");
else
llvm_unreachable("Unsupported target OS");
// Set the "arch" target configuration.
switch (triple.getArch()) {
case llvm::Triple::ArchType::arm:
LangOpts.addTargetConfigOption("arch", "arm");
break;
case llvm::Triple::ArchType::aarch64:
LangOpts.addTargetConfigOption("arch", "arm64");
break;
case llvm::Triple::ArchType::x86:
LangOpts.addTargetConfigOption("arch", "i386");
break;
case llvm::Triple::ArchType::x86_64:
LangOpts.addTargetConfigOption("arch", "x86_64");
break;
default:
llvm_unreachable("Unsupported target architecture");
}
}
void CompilerInvocation::setTargetTriple(StringRef Triple) {
IRGenOpts.Triple = Triple.str();
updateRuntimeLibraryPath();
updateRuntimeLibraryPath(SearchPathOpts, Triple);
updateTargetConfigurationOptions(LangOpts, Triple);
}
static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
@@ -937,7 +971,8 @@ bool CompilerInvocation::parseArgs(ArrayRef<const char *> Args,
return true;
}
updateRuntimeLibraryPath();
updateRuntimeLibraryPath(SearchPathOpts, getTargetTriple());
updateTargetConfigurationOptions(LangOpts, getTargetTriple());
return false;
}