aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#469: Fix for multi-target compilation

Browse Source
This commit is contained in:
Dmitry Babokin
2013-04-12 14:06:12 +04:00
parent 78a840f48d
commit a0462fe1ee
3 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
module.cpp
View File

@@ -2405,21 +2405,29 @@ Module::CompileAndOutput(const char *srcFile,
// we generate the dispatch module's functions...
}
llvm::Module *dispatchModule =
lCreateDispatchModule(exportedFunctions);
lAddExtractedGlobals(dispatchModule, globals);
// Find the first non-NULL target machine from the targets we
// compiled to above. We'll use this as the target machine for
// compiling the dispatch module--this is safe in that it is the
// least-common-denominator of all of the targets we compiled to.
llvm::TargetMachine *firstTargetMachine = targetMachines[0];
int i = 1;
while (i < Target::NUM_ISAS && firstTargetMachine == NULL)
llvm::TargetMachine *firstTargetMachine = NULL;
int i = 0;
const char *firstISA;
while (i < Target::NUM_ISAS && firstTargetMachine == NULL) {
firstISA = Target::ISAToString((Target::ISA) i);
firstTargetMachine = targetMachines[i++];
}
Assert(firstTargetMachine != NULL);
g->target = new Target(arch, cpu, firstISA, generatePIC);
if (!g->target->isValid()) {
return 1;
}
llvm::Module *dispatchModule =
lCreateDispatchModule(exportedFunctions);
lAddExtractedGlobals(dispatchModule, globals);
if (outFileName != NULL) {
if (outputType == Bitcode)
writeBitcode(dispatchModule, outFileName);
@@ -2428,6 +2436,10 @@ Module::CompileAndOutput(const char *srcFile,
outputType, outFileName);
}
delete g->target;
g->target = NULL;
return errorCount > 0;
}
}