6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-09-30 19:55:11 +00:00
Code Issues Projects Releases Wiki Activity

If we've specified a triple on the command line then go ahead

Browse Source 
and use that as the default triple for the module and target
data layout.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@179497 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Christopher 2013-04-14 23:32:40 +00:00
parent ef1762b6a1
commit 10f8d2bb5b
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/opt/opt.cpp
View File

@ -36,6 +36,7 @@
#include "llvm/Support/PassNameParser.h"
#include "llvm/Support/PluginLoader.h"
#include "llvm/Support/PrettyStackTrace.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/Signals.h"
#include "llvm/Support/SourceMgr.h"
#include "llvm/Support/SystemUtils.h"
@ -529,9 +530,8 @@ static TargetMachine* GetTargetMachine(Triple TheTriple) {
const Target *TheTarget = TargetRegistry::lookupTarget(MArch, TheTriple,
Error);
// Some modules don't specify a triple, and this is okay.
if (!TheTarget) {
if (!TheTarget)
return 0;
}
// Package up features to be passed to target/subtarget
std::string FeaturesStr;
@ -598,9 +598,12 @@ int main(int argc, char **argv) {
}
// If we are supposed to override the target triple, do so now.
if (!TargetTriple.empty())
const DataLayout *TD;
if (!TargetTriple.empty()) {
M->setTargetTriple(Triple::normalize(TargetTriple));
TD = GetTargetMachine(Triple(TargetTriple))->getDataLayout();
}
// Figure out what stream we are supposed to write to...
OwningPtr<tool_output_file> Out;
if (NoOutput) {
@ -641,16 +644,16 @@ int main(int argc, char **argv) {
TLI->disableAllFunctions();
Passes.add(TLI);
// Add an appropriate DataLayout instance for this module.
DataLayout *TD = 0;
const std::string &ModuleDataLayout = M.get()->getDataLayout();
if (!ModuleDataLayout.empty())
TD = new DataLayout(ModuleDataLayout);
else if (!DefaultDataLayout.empty())
TD = new DataLayout(DefaultDataLayout);
// If we don't have a data layout by now go ahead and set it if we can.
if (!TD) {
const std::string &ModuleDataLayout = M.get()->getDataLayout();
if (!ModuleDataLayout.empty())
TD = new DataLayout(ModuleDataLayout);
else if (!DefaultDataLayout.empty())
TD = new DataLayout(DefaultDataLayout);
}
if (TD)
Passes.add(TD);
Passes.add(new DataLayout(*TD));
Triple ModuleTriple(M->getTargetTriple());
TargetMachine *Machine = 0;