Merge remote-tracking branch 'upstream/master' into nvptx

2013-11-22 08:10:08 +01:00
parent cddddfd255 0f7ac1cc90
commit 828a5d45cd
33 changed files with 795 additions and 394 deletions
--- a/module.cpp
+++ b/module.cpp
@@ -2580,7 +2580,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);