D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-19 14:23:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't require -triple when using -march.

Browse Source 
There is really no reason we should, and I couldn't find out
why that check was added back in 2009.

Also cleaned up the code a bit now that the LLVM 3.0 branches
are gone.
This commit is contained in:
David Nadlinger
2013-10-06 01:10:26 +02:00
parent b2b56203a9
commit 02abf028f8
1 changed files with 19 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
driver/targetmachine.cpp
View File

@@ -83,66 +83,37 @@ llvm::TargetMachine* createTargetMachine(
llvm::CodeGenOpt::Level codeGenOptLevel,
bool genDebugInfo)
{
// override triple if needed
std::string defaultTriple = llvm::sys::getDefaultTargetTriple();
if (sizeof(void*) == 4 && bitness == ExplicitBitness::M64)
{
defaultTriple = llvm::Triple(defaultTriple).get64BitArchVariant().str();
}
else if (sizeof(void*) == 8 && bitness == ExplicitBitness::M32)
{
defaultTriple = llvm::Triple(defaultTriple).get32BitArchVariant().str();
}
// Determine target triple. If the user didn't explicitly specify one, use
// the one set at LLVM configure time.
llvm::Triple triple;
// did the user override the target triple?
if (targetTriple.empty())
{
if (!arch.empty())
triple = llvm::Triple(llvm::sys::getDefaultTargetTriple());
// Handle -m32/-m64.
if (sizeof(void*) == 4 && bitness == ExplicitBitness::M64)
{
error("you must specify a target triple as well with -mtriple when using the -arch option");
fatal();
triple = triple.get64BitArchVariant();
}
else if (sizeof(void*) == 8 && bitness == ExplicitBitness::M32)
{
triple = triple.get32BitArchVariant();
}
triple = llvm::Triple(defaultTriple);
}
else
{
triple = llvm::Triple(llvm::Triple::normalize(targetTriple));
}
// Allocate target machine.
const llvm::Target *theTarget = NULL;
// Check whether the user has explicitly specified an architecture to compile for.
if (arch.empty())
// Look up the LLVM backend to use.
std::string errMsg;
const llvm::Target *target =
llvm::TargetRegistry::lookupTarget(arch, triple, errMsg);
if (target == 0)
{
std::string Err;
theTarget = llvm::TargetRegistry::lookupTarget(triple.str(), Err);
if (theTarget == 0)
{
error("%s Please use the -march option.", Err.c_str());
fatal();
}
error("%s", errMsg.c_str());
fatal();
}
else
{
for (llvm::TargetRegistry::iterator it = llvm::TargetRegistry::begin(),
ie = llvm::TargetRegistry::end(); it != ie; ++it)
{
if (arch == it->getName())
{
theTarget = &*it;
break;
}
}
if (!theTarget)
{
error("invalid target '%s'", arch.c_str());
fatal();
}
}
// With an empty CPU string, LLVM will default to the host CPU, which is
// usually not what we want (expected behavior from other compilers is
@@ -176,7 +147,7 @@ llvm::TargetMachine* createTargetMachine(
llvm::TargetOptions targetOptions;
targetOptions.NoFramePointerElim = genDebugInfo;
return theTarget->createTargetMachine(
return target->createTargetMachine(
triple.str(),
cpu,
FeaturesStr,