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

Merge branch 'master' into nomosoa

Browse Source
This commit is contained in:
james.brodman
2013-12-04 13:52:44 -05:00
parent ecb1174a18 d5b7c51e40
commit a448ccf20c
113 changed files with 12702 additions and 3251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module.cpp
View File

@@ -928,7 +928,7 @@ Module::AddExportedTypes(const std::vector<std::pair<const Type *,
bool
Module::writeOutput(OutputType outputType, const char *outFileName,
const char *includeFileName) {
if (diBuilder != NULL && outputType != Header) {
if (diBuilder != NULL && (outputType != Header && outputType != Deps)) {
diBuilder->finalize();
lStripUnusedDebugInfo(module);
@@ -2096,7 +2096,7 @@ lAddExtractedGlobals(llvm::Module *module,
// example, this happens with varying globals if we compile
// to different vector widths.
if (gv2->getType() != gv->getType())
Error(rgi.pos, "Mismatch in size/layout of global "
Warning(rgi.pos, "Mismatch in size/layout of global "
"variable \"%s\" with different targets. "
"Globals must not include \"varying\" types or arrays "
"with size based on programCount when compiling to "
@@ -2446,7 +2446,7 @@ Module::CompileAndOutput(const char *srcFile,
int i = 0;
const char *firstISA;
while (i < Target::NUM_ISAS && firstTargetMachine == NULL) {
firstISA = Target::ISAToString((Target::ISA) i);
firstISA = Target::ISAToTargetString((Target::ISA) i);
firstTargetMachine = targetMachines[i++];
}
Assert(firstTargetMachine != NULL);